merge from the lp:~mvo/apt/mvo branch

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

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 83a671a9607ec9bb36797011d39e09f0c887ed22..25ecb7af1d0773c13fb5bed21c4ef7367b192fb0 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -11,10 +11,12 @@
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/cachefile.h>
+#include <apt-pkg/cacheset.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/edsp.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgsystem.h>
 
 #include <config.h>
 #include <apti18n.h>
@@ -27,7 +29,7 @@
 // ---------------------------------------------------------------------
 /* */
 bool ShowHelp(CommandLine &CmdL) {
-       ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+       ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
                 COMMON_ARCH,__DATE__,__TIME__);
 
        std::cout <<
@@ -53,6 +55,8 @@ int main(int argc,const char *argv[])                                 /*{{{*/
                {'v',"version","version",0},
                {'q',"quiet","quiet",CommandLine::IntLevel},
                {'q',"silent","quiet",CommandLine::IntLevel},
+               {'c',"config-file",0,CommandLine::ConfigFile},
+               {'o',"option",0,CommandLine::ArbItem},
                {0,0,0,0}};
 
        CommandLine CmdL(Args,_config);
@@ -69,6 +73,25 @@ int main(int argc,const char *argv[])                                        /*{{{*/
                return 1;
        }
 
+       if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
+       {
+               if (pkgInitSystem(*_config,_system) == false) {
+                       std::cerr << "System could not be initialized!" << std::endl;
+                       return 1;
+               }
+               pkgCacheFile CacheFile;
+               CacheFile.Open(NULL, false);
+               APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
+               FILE* output = stdout;
+               if (pkgset.empty() == true)
+                       EDSP::WriteScenario(CacheFile, output);
+               else
+                       EDSP::WriteLimitedScenario(CacheFile, output, pkgset);
+               fclose(output);
+               _error->DumpErrors(std::cerr);
+               return 0;
+       }
+
        // Deal with stdout not being a tty
        if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
                _config->Set("quiet","1");
@@ -76,17 +99,21 @@ int main(int argc,const char *argv[])                                       /*{{{*/
        if (_config->FindI("quiet", 0) < 1)
                _config->Set("Debug::EDSP::WriteSolution", true);
 
-       _config->Set("APT::Solver::Name", "internal");
+       _config->Set("APT::Solver", "internal");
        _config->Set("edsp::scenario", "stdin");
        int input = STDIN_FILENO;
        FILE* output = stdout;
        SetNonBlock(input, false);
 
+       EDSP::WriteProgress(0, "Start up solver…", output);
+
        if (pkgInitSystem(*_config,_system) == false) {
                std::cerr << "System could not be initialized!" << std::endl;
                return 1;
        }
 
+       EDSP::WriteProgress(1, "Read request…", output);
+
        if (WaitFd(input, false, 5) == false)
                std::cerr << "WAIT timed out in the resolver" << std::endl;
 
@@ -97,9 +124,13 @@ int main(int argc,const char *argv[])                                       /*{{{*/
                return 2;
        }
 
+       EDSP::WriteProgress(5, "Read scenario…", output);
+
        pkgCacheFile CacheFile;
        CacheFile.Open(NULL, false);
 
+       EDSP::WriteProgress(50, "Apply request on scenario…", output);
+
        if (EDSP::ApplyRequest(install, remove, CacheFile) == false) {
                std::cerr << "Failed to apply request to depcache!" << std::endl;
                return 3;
@@ -125,22 +156,37 @@ int main(int argc,const char *argv[])                                     /*{{{*/
             i != install.end(); ++i)
                CacheFile->MarkInstall(CacheFile->FindPkg(*i), true);
 
-
-       if (Fix.Resolve() == false) {
-               EDSP::WriteError("An error occured", output);
+       EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
+
+       if (upgrade == true) {
+               if (pkgAllUpgrade(CacheFile) == false) {
+                       EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occured", output);
+                       return 0;
+               }
+       } else if (distUpgrade == true) {
+               if (pkgDistUpgrade(CacheFile) == false) {
+                       EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occured", output);
+                       return 0;
+               }
+       } else if (Fix.Resolve() == false) {
+               EDSP::WriteError("ERR_UNSOLVABLE", "An error occured", output);
                return 0;
        }
 
+       EDSP::WriteProgress(95, "Write solution…", output);
+
        if (EDSP::WriteSolution(CacheFile, output) == false) {
                std::cerr << "Failed to output the solution!" << std::endl;
                return 4;
        }
 
+       EDSP::WriteProgress(100, "Done", output);
+
        bool const Errors = _error->PendingError();
        if (_config->FindI("quiet",0) > 0)
-               _error->DumpErrors();
+               _error->DumpErrors(std::cerr);
        else
-               _error->DumpErrors(GlobalError::DEBUG);
+               _error->DumpErrors(std::cerr, GlobalError::DEBUG);
        return Errors == true ? 100 : 0;
 }
                                                                        /*}}}*/