From: Michael Vogt <mvo@debian.org>
Date: Sat, 5 Oct 2013 09:55:08 +0000 (+0200)
Subject: re-add "Calculating upgrade..." message
X-Git-Tag: 0.9.13.exp1~11^2~2^2~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/7cf45682e5fcac541e495242bdc4885bbb8b2ef7

re-add "Calculating upgrade..." message
---

diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc
index 00608866f..df8fe8686 100644
--- a/apt-private/private-upgrade.cc
+++ b/apt-private/private-upgrade.cc
@@ -14,19 +14,18 @@ static bool UpgradeHelper(CommandLine &CmdL, int UpgradeFlags)
    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
       return false;
 
-   //c0out << _("Calculating upgrade... ") << std::flush;
+   c0out << _("Calculating upgrade... ") << std::flush;
    if (APT::Upgrade::Upgrade(Cache, UpgradeFlags) == false)
    {
       c0out << _("Failed") << std::endl;
       ShowBroken(c1out,Cache,false);
       return _error->Error(_("Internal error, Upgrade broke stuff"));
    }
+   c0out << _("Done") << std::endl;
 
    // parse additional cmdline pkg manipulation switches
    if(!DoCacheManipulationFromCommandLine(CmdL, Cache))
       return false;
-
-   //c0out << _("Done") << std::endl;
    
    return InstallPackages(Cache,true);
 }