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 83d79e42a54cf2420626e4f19db242df5c57657e..92a4429e5789a408a7b4c8350b11300c3c18327e 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -7,45 +7,64 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/error.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/error.h>
 #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/strutl.h>
 #include <apt-pkg/edsp.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/fileutl.h>

-
-#include <config.h>
-#include <apti18n.h>
-
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/upgrade.h>
+#include <apt-pkg/configuration.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 <sstream>
+#include <list>
+#include <string>

 #include <unistd.h>
 #include <cstdio>
 #include <unistd.h>
 #include <cstdio>

+#include <stdlib.h>
+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
                                                                        /*}}}*/
 
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool ShowHelp(CommandLine &CmdL) {
-       ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+static bool ShowHelp(CommandLine &) {
+       ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,

                 COMMON_ARCH,__DATE__,__TIME__);
 
        std::cout <<
                 COMMON_ARCH,__DATE__,__TIME__);
 
        std::cout <<

-               _("Usage: apt-internal-resolver\n"
+               _("Usage: apt-internal-solver\n"

                "\n"
                "\n"

-               "apt-internal-resolver is an interface to use the current internal\n"
+               "apt-internal-solver is an interface to use the current internal\n"

                "like an external resolver for the APT family for debugging or alike\n"
                "\n"
                "Options:\n"
                "  -h  This help text.\n"
                "  -q  Loggable output - no progress indicator\n"
                "  -c=? Read this configuration file\n"
                "like an external resolver for the APT family for debugging or alike\n"
                "\n"
                "Options:\n"
                "  -h  This help text.\n"
                "  -q  Loggable output - no progress indicator\n"
                "  -c=? Read this configuration file\n"

-               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-               "apt.conf(5) manual pages for more information and options.\n"
-               "                       This APT has Super Cow Powers.\n");
+               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");

        return true;
 }
                                                                        /*}}}*/
        return true;
 }
                                                                        /*}}}*/

+APT_NORETURN static void DIE(std::string const &message) {             /*{{{*/
+       std::cerr << "ERROR: " << message << std::endl;
+       _error->DumpErrors(std::cerr);
+       exit(EXIT_FAILURE);
+}
+                                                                       /*}}}*/

 int main(int argc,const char *argv[])                                  /*{{{*/
 {
        CommandLine::Args Args[] = {
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
        CommandLine::Args Args[] = {


@@ -53,8 +72,13 @@ int main(int argc,const char *argv[])                                        /*{{{*/
                {'v',"version","version",0},
                {'q',"quiet","quiet",CommandLine::IntLevel},
                {'q',"silent","quiet",CommandLine::IntLevel},
                {'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}};
 
                {0,0,0,0}};
 

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

        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) {


@@ -69,6 +93,25 @@ int main(int argc,const char *argv[])                                        /*{{{*/
                return 1;
        }
 
                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");
        // Deal with stdout not being a tty
        if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
                _config->Set("quiet","1");


@@ -76,54 +119,89 @@ int main(int argc,const char *argv[])                                      /*{{{*/
        if (_config->FindI("quiet", 0) < 1)
                _config->Set("Debug::EDSP::WriteSolution", true);
 
        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);
 
        _config->Set("edsp::scenario", "stdin");
        int input = STDIN_FILENO;
        FILE* output = stdout;
        SetNonBlock(input, false);
 

-       if (pkgInitSystem(*_config,_system) == false) {
-               std::cerr << "System could not be initialized!" << std::endl;
-               return 1;
-       }
+       EDSP::WriteProgress(0, "Start up solver…", output);
+
+       if (pkgInitSystem(*_config,_system) == false)
+               DIE("System could not be initialized!");
+
+       EDSP::WriteProgress(1, "Read request…", output);

 
        if (WaitFd(input, false, 5) == false)
 
        if (WaitFd(input, false, 5) == false)

-               std::cerr << "WAIT timed out in the resolver" << std::endl;
+               DIE("WAIT timed out in the resolver");

 
        std::list<std::string> install, remove;
        bool upgrade, distUpgrade, autoRemove;
 
        std::list<std::string> install, remove;
        bool upgrade, distUpgrade, autoRemove;

-       if (EDSP::ReadRequest(input, install, remove, upgrade, distUpgrade, autoRemove) == false) {
-               std::cerr << "Parsing the request failed!" << std::endl;
-               return 2;
-       }
+       if (EDSP::ReadRequest(input, install, remove, upgrade, distUpgrade, autoRemove) == false)
+               DIE("Parsing the request failed!");
+
+       EDSP::WriteProgress(5, "Read scenario…", output);

 
        pkgCacheFile CacheFile;
 
        pkgCacheFile CacheFile;

-       CacheFile.Open(NULL, false);
+       if (CacheFile.Open(NULL, false) == false)
+               DIE("Failed to open CacheFile!");
+
+       EDSP::WriteProgress(50, "Apply request on scenario…", output);
+
+       if (EDSP::ApplyRequest(install, remove, CacheFile) == false)
+               DIE("Failed to apply request to depcache!");
+
+       pkgProblemResolver Fix(CacheFile);
+       for (std::list<std::string>::const_iterator i = remove.begin();
+            i != remove.end(); ++i) {
+               pkgCache::PkgIterator P = CacheFile->FindPkg(*i);
+               Fix.Clear(P);
+               Fix.Protect(P);
+               Fix.Remove(P);
+       }

 
 

-       if (EDSP::ApplyRequest(install, remove, CacheFile) == false) {
-               std::cerr << "Failed to apply request to depcache!" << std::endl;
-               return 3;
+       for (std::list<std::string>::const_iterator i = install.begin();
+            i != install.end(); ++i) {
+               pkgCache::PkgIterator P = CacheFile->FindPkg(*i);
+               Fix.Clear(P);
+               Fix.Protect(P);

        }
        }

+

        for (std::list<std::string>::const_iterator i = install.begin();
             i != install.end(); ++i)
                CacheFile->MarkInstall(CacheFile->FindPkg(*i), true);
 
        for (std::list<std::string>::const_iterator i = install.begin();
             i != install.end(); ++i)
                CacheFile->MarkInstall(CacheFile->FindPkg(*i), true);
 

-       pkgProblemResolver Fix(CacheFile);
-       if (Fix.Resolve() == false) {
-               EDSP::WriteError("An error occured", output);
+       EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
+
+       std::string failure;
+       if (upgrade == true) {
+               if (APT::Upgrade::Upgrade(CacheFile, APT::Upgrade::FORBID_REMOVE_PACKAGES | APT::Upgrade::FORBID_INSTALL_NEW_PACKAGES) == false)
+                       failure = "ERR_UNSOLVABLE_UPGRADE";
+       } else if (distUpgrade == true) {
+               if (APT::Upgrade::Upgrade(CacheFile, APT::Upgrade::ALLOW_EVERYTHING) == 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;
        }
 

-       if (EDSP::WriteSolution(CacheFile, output) == false) {
-               std::cerr << "Failed to output the solution!" << std::endl;
-               return 4;
-       }
+       EDSP::WriteProgress(95, "Write solution…", output);
+
+       if (EDSP::WriteSolution(CacheFile, output) == false)
+               DIE("Failed to output the solution!");
+
+       EDSP::WriteProgress(100, "Done", output);

 
        bool const Errors = _error->PendingError();
        if (_config->FindI("quiet",0) > 0)
 
        bool const Errors = _error->PendingError();
        if (_config->FindI("quiet",0) > 0)

-               _error->DumpErrors();
+               _error->DumpErrors(std::cerr);

        else
        else

-               _error->DumpErrors(GlobalError::DEBUG);
+               _error->DumpErrors(std::cerr, GlobalError::DEBUG);

        return Errors == true ? 100 : 0;
 }
                                                                        /*}}}*/
        return Errors == true ? 100 : 0;
 }
                                                                        /*}}}*/