if file is inaccessible for _apt, disable privilege drop in acquire

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

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index e4cdf63813ac241f24f3e81961c4eca7d1b02c9a..af301dbcd7dd0201e7d5478a43cb8ff07c3a7f74 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -25,8 +25,12 @@
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
 

+#include <apt-private/private-output.h>
+#include <apt-private/private-cmndline.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>


@@ -40,8 +44,7 @@
 // ---------------------------------------------------------------------
 /* */
 static bool ShowHelp(CommandLine &) {
 // ---------------------------------------------------------------------
 /* */
 static bool ShowHelp(CommandLine &) {

-       ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-                COMMON_ARCH,__DATE__,__TIME__);
+       ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

 
        std::cout <<
                _("Usage: apt-internal-solver\n"
 
        std::cout <<
                _("Usage: apt-internal-solver\n"


@@ -74,19 +77,11 @@ 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}};
 

-       CommandLine CmdL(Args,_config);
-       if (pkgInitConfig(*_config) == false ||
-           CmdL.Parse(argc,argv) == false) {
-               _error->DumpErrors();
-               return 2;
-       }
+        // we really don't need anything
+        DropPrivileges();

 
 

-       // See if the help should be shown
-       if (_config->FindB("help") == true ||
-           _config->FindB("version") == true) {
-               ShowHelp(CmdL);
-               return 1;
-       }
+       CommandLine CmdL;
+       ParseCommandLine(CmdL, NULL, Args, &_config, NULL, argc, argv, ShowHelp);

 
        if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
        {
 
        if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
        {


@@ -114,6 +109,7 @@ 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::System", "Debian APT solver interface");

        _config->Set("APT::Solver", "internal");
        _config->Set("edsp::scenario", "stdin");
        int input = STDIN_FILENO;
        _config->Set("APT::Solver", "internal");
        _config->Set("edsp::scenario", "stdin");
        int input = STDIN_FILENO;


@@ -168,18 +164,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 (APT::Upgrade::Upgrade(CacheFile, APT::Upgrade::FORBID_REMOVE_PACKAGES | APT::Upgrade::FORBID_INSTALL_NEW_PACKAGES) == 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 (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;
        }