Explorar el Código

work on requests with the correct upgrade/dist-upgrade/else resolver

David Kalnischkies hace 15 años
padre
commit
80699703b6
Se han modificado 1 ficheros con 11 adiciones y 1 borrados
  1. 11 1
      cmdline/apt-internal-solver.cc

+ 11 - 1
cmdline/apt-internal-solver.cc

@@ -156,7 +156,17 @@ int main(int argc,const char *argv[])					/*{{{*/
 
 	EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
 
-	if (Fix.Resolve() == false) {
+	if (upgrade == true) {
+		if (pkgAllUpgrade(CacheFile) == false) {
+			EDSP::WriteError("An upgrade error occured", output);
+			return 0;
+		}
+	} else if (distUpgrade == true) {
+		if (pkgDistUpgrade(CacheFile) == false) {
+			EDSP::WriteError("An dist-upgrade error occured", output);
+			return 0;
+		}
+	} else if (Fix.Resolve() == false) {
 		EDSP::WriteError("An error occured", output);
 		return 0;
 	}