summaryrefslogtreecommitdiff
path: root/apt-private
diff options
context:
space:
mode:
Diffstat (limited to 'apt-private')
-rw-r--r--apt-private/private-install.cc11
-rw-r--r--apt-private/private-upgrade.cc2
2 files changed, 7 insertions, 6 deletions
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index 55893bda0..656b97233 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -620,14 +620,17 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache,
{
// Call the scored problem resolver
bool resolver_fail = false;
+ OpTextProgress Progress(*_config);
+ bool const distUpgradeMode = strcmp(CmdL.FileList[0], "dist-upgrade") == 0 || strcmp(CmdL.FileList[0], "full-upgrade") == 0;
+
if (UpgradeMode == 0)
{
- if (strcmp(CmdL.FileList[0], "dist-upgrade") == 0 || strcmp(CmdL.FileList[0], "full-upgrade") == 0)
- resolver_fail = APT::Upgrade::Upgrade(Cache, 0);
+ if (distUpgradeMode == true)
+ resolver_fail = APT::Upgrade::Upgrade(Cache, 0, &Progress);
else
- resolver_fail = Fix->Resolve(true);
+ resolver_fail = Fix->Resolve(true, &Progress);
} else
- resolver_fail = APT::Upgrade::Upgrade(Cache, UpgradeMode);
+ resolver_fail = APT::Upgrade::Upgrade(Cache, UpgradeMode, &Progress);
if (resolver_fail == false && Cache->BrokenCount() == 0)
return false;
diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc
index 31f067576..2a6dcc153 100644
--- a/apt-private/private-upgrade.cc
+++ b/apt-private/private-upgrade.cc
@@ -22,10 +22,8 @@ static bool UpgradeHelper(CommandLine &CmdL, int UpgradeFlags)
if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
return false;
- c0out << _("Calculating upgrade... ") << std::flush;
if(!DoCacheManipulationFromCommandLine(CmdL, Cache, UpgradeFlags))
return false;
- c0out << _("Done") << std::endl;
return InstallPackages(Cache,true);
}