fix crash when P.Arch() was used but the cache got remapped

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

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 68489e21313894eda4f69709722cf9d4fbaaac58..ef6c688fec74b488603e994b4113f2551ede8a1d 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -97,17 +97,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;
 
@@ -118,9 +122,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;
@@ -146,17 +154,32 @@ int main(int argc,const char *argv[])                                     /*{{{*/
             i != install.end(); ++i)
                CacheFile->MarkInstall(CacheFile->FindPkg(*i), true);
 
+       EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
 
-       if (Fix.Resolve() == false) {
-               EDSP::WriteError("An error occured", 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(std::cerr);