From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 3 May 2011 08:38:49 +0000 (+0200)
Subject: work on requests with the correct upgrade/dist-upgrade/else resolver
X-Git-Tag: 0.9.0~91^2~11^2~14
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/80699703b6015a8fe7707302f365020f9782cf2c

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

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 0aa218d52..df6a6f569 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/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;
 	}