Explorar el Código

if Resolver fails, do not continue even if not broken

This can happen if the request is already a well-formed request all by
itself (e.g. the package has no dependencies), but the resolver found
a reason to not accept it as solution. Our edsp 'dump' solver e.g.
shouldn't be able to trigger install, which it does otherwise.
David Kalnischkies hace 12 años
padre
commit
58377ceb4b
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. 2 1
      apt-private/private-install.cc

+ 2 - 1
apt-private/private-install.cc

@@ -617,7 +617,8 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache,
       if (Fix != NULL)
       {
 	 // Call the scored problem resolver
-	 Fix->Resolve(true);
+	 if (Fix->Resolve(true) == false && Cache->BrokenCount() == 0)
+	    return false;
       }
 
       // Now we check the state of the packages,