work on requests with the correct upgrade/dist-upgrade/else resolver
authorDavid Kalnischkies <kalnischkies@gmail.com>
Tue, 3 May 2011 08:38:49 +0000 (10:38 +0200)
committerDavid Kalnischkies <kalnischkies@gmail.com>
Tue, 3 May 2011 08:38:49 +0000 (10:38 +0200)
cmdline/apt-internal-solver.cc

index 0aa218d..df6a6f5 100644 (file)
@@ -156,7 +156,17 @@ int main(int argc,const char *argv[])                                      /*{{{*/
 
        EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
 
-       if (Fix.Resolve() == false) {
+       if (upgrade == true) {
+               if (pkgAllUpgrade(CacheFile) == false) {
+                       EDSP::WriteError("An upgrade error occured", output);
+                       return 0;
+               }
+       } else if (distUpgrade == true) {
+               if (pkgDistUpgrade(CacheFile) == false) {
+                       EDSP::WriteError("An dist-upgrade error occured", output);
+                       return 0;
+               }
+       } else if (Fix.Resolve() == false) {
                EDSP::WriteError("An error occured", output);
                return 0;
        }