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