1 files changed, 46 insertions, 36 deletions
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index 835e7674a..fc89c82a2 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -261,52 +261,62 @@ namespace
                     std::ref(ser_stream),
                     std::cref(*resolved)));
 
-        std::shared_ptr<Sequence<std::string> > args(std::make_shared<Sequence<std::string>>());
+        int result;
 
-        for (args::ArgsSection::GroupsConstIterator g(display_options.begin()), g_end(display_options.end()) ;
-                g != g_end ; ++g)
+        try
         {
-            for (args::ArgsGroup::ConstIterator o(g->begin()), o_end(g->end()) ;
-                    o != o_end ; ++o)
-                if ((*o)->specified())
-                {
-                    const std::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
-                    std::copy(f->begin(), f->end(), args->back_inserter());
-                }
-        }
+            std::shared_ptr<Sequence<std::string> > args(std::make_shared<Sequence<std::string>>());
 
-        for (Sequence<std::pair<std::string, std::string> >::ConstIterator p(targets->begin()), p_end(targets->end()) ;
-                p != p_end ; ++p)
-            args->push_back(p->first);
+            for (args::ArgsSection::GroupsConstIterator g(display_options.begin()), g_end(display_options.end()) ;
+                    g != g_end ; ++g)
+            {
+                for (args::ArgsGroup::ConstIterator o(g->begin()), o_end(g->end()) ;
+                        o != o_end ; ++o)
+                    if ((*o)->specified())
+                    {
+                        const std::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
+                        std::copy(f->begin(), f->end(), args->back_inserter());
+                    }
+            }
 
-        int result;
-        if (program_options.a_display_resolution_program.specified())
-        {
-            std::string command(program_options.a_display_resolution_program.argument());
+            for (Sequence<std::pair<std::string, std::string> >::ConstIterator p(targets->begin()), p_end(targets->end()) ;
+                    p != p_end ; ++p)
+                args->push_back(p->first);
 
-            if (keys_if_import)
-                for (Map<std::string, std::string>::ConstIterator k(keys_if_import->begin()),
-                        k_end(keys_if_import->end()) ;
-                        k != k_end ; ++k)
-                {
-                    args->push_back("--unpackaged-repository-params");
-                    args->push_back(k->first + "=" + k->second);
-                }
+            if (program_options.a_display_resolution_program.specified())
+            {
+                std::string command(program_options.a_display_resolution_program.argument());
 
-            for (Sequence<std::string>::ConstIterator a(args->begin()), a_end(args->end()) ;
-                    a != a_end ; ++a)
-                command = command + " " + args::escape(*a);
+                if (keys_if_import)
+                    for (Map<std::string, std::string>::ConstIterator k(keys_if_import->begin()),
+                            k_end(keys_if_import->end()) ;
+                            k != k_end ; ++k)
+                    {
+                        args->push_back("--unpackaged-repository-params");
+                        args->push_back(k->first + "=" + k->second);
+                    }
 
-            Process process((ProcessCommand(command)));
-            process
-                .send_input_to_fd(ser_stream, -1, "PALUDIS_SERIALISED_RESOLUTION_FD");
+                for (Sequence<std::string>::ConstIterator a(args->begin()), a_end(args->end()) ;
+                        a != a_end ; ++a)
+                    command = command + " " + args::escape(*a);
 
-            result = process.run().wait();
+                Process process((ProcessCommand(command)));
+                process
+                    .send_input_to_fd(ser_stream, -1, "PALUDIS_SERIALISED_RESOLUTION_FD");
+
+                result = process.run().wait();
+            }
+            else
+                result = DisplayResolutionCommand().run(env, args, resolved);
+
+            ser_thread.join();
+        }
+        catch (...)
+        {
+            ser_thread.join();
+            throw;
         }
-        else
-            result = DisplayResolutionCommand().run(env, args, resolved);
 
-        ser_thread.join();
         return result;
     }