Merge branch 'debian/sid' into debian/experimental

[apt.git] / cmdline / apt-internal-solver.cc

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index e4cdf63813ac241f24f3e81961c4eca7d1b02c9a..c24a96cdfa2d87152287e8c2c7ef30d15befba70 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -24,9 +24,11 @@
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>

+#include <apt-private/private-output.h>

 
 #include <string.h>
 #include <iostream>
 
 #include <string.h>
 #include <iostream>

+#include <sstream>

 #include <list>
 #include <string>
 #include <unistd.h>
 #include <list>
 #include <string>
 #include <unistd.h>


@@ -74,6 +76,9 @@ int main(int argc,const char *argv[])                                 /*{{{*/
                {'o',"option",0,CommandLine::ArbItem},
                {0,0,0,0}};
 
                {'o',"option",0,CommandLine::ArbItem},
                {0,0,0,0}};
 

+        // we really don't need anything
+        DropPrivs();
+

        CommandLine CmdL(Args,_config);
        if (pkgInitConfig(*_config) == false ||
            CmdL.Parse(argc,argv) == false) {
        CommandLine CmdL(Args,_config);
        if (pkgInitConfig(*_config) == false ||
            CmdL.Parse(argc,argv) == false) {


@@ -168,18 +173,20 @@ int main(int argc,const char *argv[])                                     /*{{{*/
 
        EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
 
 
        EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
 

+       std::string failure;

        if (upgrade == true) {
        if (upgrade == true) {

-               if (pkgAllUpgrade(CacheFile) == false) {
-                       EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occurred", output);
-                       return 0;
-               }
+               if (pkgAllUpgrade(CacheFile) == false)
+                       failure = "ERR_UNSOLVABLE_UPGRADE";

        } else if (distUpgrade == true) {
        } else if (distUpgrade == true) {

-               if (pkgDistUpgrade(CacheFile) == false) {
-                       EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occurred", output);
-                       return 0;
-               }
-       } else if (Fix.Resolve() == false) {
-               EDSP::WriteError("ERR_UNSOLVABLE", "An error occurred", output);
+               if (pkgDistUpgrade(CacheFile) == false)
+                       failure = "ERR_UNSOLVABLE_DIST_UPGRADE";
+       } else if (Fix.Resolve() == false)
+               failure = "ERR_UNSOLVABLE";
+
+       if (failure.empty() == false) {
+               std::ostringstream broken;
+               ShowBroken(broken, CacheFile, false);
+               EDSP::WriteError(failure.c_str(), broken.str(), output);

                return 0;
        }
 
                return 0;
        }