Просмотр исходного кода

re-add "Calculating upgrade..." message

Michael Vogt лет назад: 12
Родитель
Сommit
7cf45682e5
1 измененных файлов с 2 добавлено и 3 удалено
  1. 2 3
      apt-private/private-upgrade.cc

+ 2 - 3
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);
 }