summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-05-03 10:38:49 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-05-03 10:38:49 +0200
commit80699703b6015a8fe7707302f365020f9782cf2c (patch)
treefc25bc5d4f0e16907868a527a7a862cbeec16308 /cmdline
parent9221da7e1d5516494d17043a4d0b063a1d6b95c2 (diff)
work on requests with the correct upgrade/dist-upgrade/else resolver
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-internal-solver.cc12
1 files changed, 11 insertions, 1 deletions
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;
}