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 92a4429e5789a408a7b4c8350b11300c3c18327e..af301dbcd7dd0201e7d5478a43cb8ff07c3a7f74 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -24,7 +24,9 @@
 #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 <apt-private/private-output.h>

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

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


@@ -42,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"


@@ -79,19 +80,8 @@ int main(int argc,const char *argv[])                                        /*{{{*/
         // we really don't need anything
         DropPrivileges();
 
         // we really don't need anything
         DropPrivileges();
 

-       CommandLine CmdL(Args,_config);
-       if (pkgInitConfig(*_config) == false ||
-           CmdL.Parse(argc,argv) == false) {
-               _error->DumpErrors();
-               return 2;
-       }
-
-       // 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)
        {


@@ -119,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;