Browse Source

fix progress output for (dist-)upgrade calculation

Previously, we had a start and a done of the calculation printed by
higher-level code, but this got intermixed by progress reporting from an
external solver or the output of autoremove code…

The higherlevel code is now only responsible for instantiating a
progress object of its choosing (if it wants progress after all) and the
rest will be handled by the upgrade code. Either it is used to show the
progress of the external solver or the internal solver will give some
hints about its overall progress. The later isn't really a proper
progress as it will jump forward after each substep, but that is at
least a bit better than before without any progress indication.

Fixes also the 'strange' non-display of this progress line in -q=1, while
all others are shown, which is reflected by all testcase changes.
tags/debian/1.1.exp4
David Kalnischkies 7 years ago
parent
commit
2a884c612b
73 changed files with 223 additions and 148 deletions
  1. +6
    -10
      apt-pkg/algorithms.cc
  2. +5
    -5
      apt-pkg/algorithms.h
  3. +69
    -35
      apt-pkg/upgrade.cc
  4. +7
    -5
      apt-pkg/upgrade.h
  5. +7
    -4
      apt-private/private-install.cc
  6. +0
    -2
      apt-private/private-upgrade.cc
  7. +2
    -2
      po/ar.po
  8. +2
    -2
      po/ast.po
  9. +2
    -2
      po/bg.po
  10. +2
    -2
      po/bs.po
  11. +2
    -2
      po/ca.po
  12. +2
    -2
      po/cs.po
  13. +2
    -2
      po/cy.po
  14. +2
    -2
      po/da.po
  15. +2
    -2
      po/de.po
  16. +2
    -2
      po/dz.po
  17. +2
    -2
      po/el.po
  18. +2
    -2
      po/es.po
  19. +2
    -2
      po/eu.po
  20. +2
    -2
      po/fi.po
  21. +2
    -2
      po/fr.po
  22. +2
    -2
      po/gl.po
  23. +1
    -1
      po/he.po
  24. +2
    -2
      po/hu.po
  25. +2
    -2
      po/it.po
  26. +2
    -2
      po/ja.po
  27. +2
    -2
      po/km.po
  28. +2
    -2
      po/ko.po
  29. +2
    -2
      po/ku.po
  30. +2
    -2
      po/lt.po
  31. +2
    -2
      po/mr.po
  32. +2
    -2
      po/nb.po
  33. +2
    -2
      po/ne.po
  34. +2
    -2
      po/nl.po
  35. +2
    -2
      po/nn.po
  36. +2
    -2
      po/pl.po
  37. +2
    -2
      po/pt.po
  38. +2
    -2
      po/pt_BR.po
  39. +2
    -2
      po/ro.po
  40. +2
    -2
      po/ru.po
  41. +2
    -2
      po/sk.po
  42. +2
    -2
      po/sl.po
  43. +2
    -2
      po/sv.po
  44. +2
    -2
      po/th.po
  45. +2
    -2
      po/tl.po
  46. +2
    -2
      po/tr.po
  47. +2
    -2
      po/uk.po
  48. +2
    -2
      po/vi.po
  49. +2
    -2
      po/zh_CN.po
  50. +2
    -2
      po/zh_TW.po
  51. +6
    -0
      test/integration/test-allow-scores-for-all-dependency-types
  52. +3
    -0
      test/integration/test-apt-get-upgrade
  53. +1
    -0
      test/integration/test-bug-507998-dist-upgrade-recommends
  54. +2
    -0
      test/integration/test-bug-591882-conkeror
  55. +1
    -0
      test/integration/test-bug-605394-versioned-or-groups
  56. +2
    -0
      test/integration/test-bug-612099-multiarch-conflicts
  57. +2
    -0
      test/integration/test-bug-64141-install-dependencies-for-on-hold
  58. +1
    -0
      test/integration/test-bug-657695-resolver-breaks-on-virtuals
  59. +1
    -0
      test/integration/test-bug-675449-essential-are-protected
  60. +4
    -0
      test/integration/test-bug-680041-apt-mark-holds-correctly
  61. +1
    -0
      test/integration/test-bug-686346-package-missing-architecture
  62. +2
    -0
      test/integration/test-bug-735967-lib32-to-i386-unavailable
  63. +2
    -0
      test/integration/test-bug-740843-versioned-up-down-breaks
  64. +1
    -0
      test/integration/test-bug-758153-versioned-provides-support
  65. +1
    -0
      test/integration/test-conflicts-loop
  66. +3
    -0
      test/integration/test-pin-non-existent-package
  67. +1
    -0
      test/integration/test-prevent-markinstall-multiarch-same-versionscrew
  68. +1
    -0
      test/integration/test-provides-gone-with-upgrade
  69. +1
    -0
      test/integration/test-resolve-by-keep-new-recommends
  70. +2
    -0
      test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
  71. +1
    -0
      test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering
  72. +1
    -0
      test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
  73. +2
    -0
      test/integration/test-xorg-break-providers

+ 6
- 10
apt-pkg/algorithms.cc View File

@@ -640,13 +640,11 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
// ProblemResolver::Resolve - calls a resolver to fix the situation /*{{{*/
// ---------------------------------------------------------------------
/* */
bool pkgProblemResolver::Resolve(bool BrokenFix)
bool pkgProblemResolver::Resolve(bool BrokenFix, OpProgress * const Progress)
{
std::string const solver = _config->Find("APT::Solver", "internal");
if (solver != "internal") {
OpTextProgress Prog(*_config);
return EDSP::ResolveExternal(solver.c_str(), Cache, false, false, false, &Prog);
}
if (solver != "internal")
return EDSP::ResolveExternal(solver.c_str(), Cache, false, false, false, Progress);
return ResolveInternal(BrokenFix);
}
/*}}}*/
@@ -1140,13 +1138,11 @@ bool pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator I)
/* This is the work horse of the soft upgrade routine. It is very gental
in that it does not install or remove any packages. It is assumed that the
system was non-broken previously. */
bool pkgProblemResolver::ResolveByKeep()
bool pkgProblemResolver::ResolveByKeep(OpProgress * const Progress)
{
std::string const solver = _config->Find("APT::Solver", "internal");
if (solver != "internal") {
OpTextProgress Prog(*_config);
return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, &Prog);
}
if (solver != "internal")
return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, Progress);
return ResolveByKeepInternal();
}
/*}}}*/


+ 5
- 5
apt-pkg/algorithms.h View File

@@ -136,12 +136,12 @@ class pkgProblemResolver /*{{{*/
inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected; Cache.MarkProtected(Pkg);};
inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemove;};
inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
// Try to intelligently resolve problems by installing and removing packages
bool Resolve(bool BrokenFix = false);
// Try to intelligently resolve problems by installing and removing packages
bool Resolve(bool BrokenFix = false, OpProgress * const Progress = NULL);
// Try to resolve problems only by using keep
bool ResolveByKeep();
bool ResolveByKeep(OpProgress * const Progress = NULL);

APT_DEPRECATED void InstallProtect();



+ 69
- 35
apt-pkg/upgrade.cc View File

@@ -24,13 +24,14 @@
The problem resolver is used to resolve the problems.
*/
bool pkgDistUpgrade(pkgDepCache &Cache)
bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress)
{
std::string const solver = _config->Find("APT::Solver", "internal");
if (solver != "internal") {
OpTextProgress Prog(*_config);
return EDSP::ResolveExternal(solver.c_str(), Cache, false, true, false, &Prog);
}
if (solver != "internal")
return EDSP::ResolveExternal(solver.c_str(), Cache, false, true, false, Progress);

if (Progress != NULL)
Progress->OverallProgress(0, 100, 1, _("Calculating upgrade"));

pkgDepCache::ActionGroup group(Cache);

@@ -41,12 +42,18 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
if (I->CurrentVer != 0)
Cache.MarkInstall(I, false, 0, false);

if (Progress != NULL)
Progress->Progress(10);

/* Auto upgrade all installed packages, this provides the basis
for the installation */
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
if (I->CurrentVer != 0)
Cache.MarkInstall(I, true, 0, false);

if (Progress != NULL)
Progress->Progress(50);

/* Now, install each essential package which is not installed
(and not provided by another package in the same name group) */
std::string essential = _config->Find("pkgCacheGen::Essential", "all");
@@ -77,15 +84,24 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
Cache.MarkInstall(I, true, 0, false);

if (Progress != NULL)
Progress->Progress(55);

/* We do it again over all previously installed packages to force
conflict resolution on them all. */
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
if (I->CurrentVer != 0)
Cache.MarkInstall(I, false, 0, false);

if (Progress != NULL)
Progress->Progress(65);

pkgProblemResolver Fix(&Cache);

if (Progress != NULL)
Progress->Progress(95);

// Hold back held packages.
if (_config->FindB("APT::Ignore-Hold",false) == false)
{
@@ -98,18 +114,22 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
}
}
}
return Fix.Resolve();

bool const success = Fix.Resolve(false, Progress);
if (Progress != NULL)
Progress->Done();
return success;
}
/*}}}*/
// AllUpgradeNoNewPackages - Upgrade but no removals or new pkgs /*{{{*/
static bool pkgAllUpgradeNoNewPackages(pkgDepCache &Cache)
static bool pkgAllUpgradeNoNewPackages(pkgDepCache &Cache, OpProgress * const Progress)
{
std::string const solver = _config->Find("APT::Solver", "internal");
if (solver != "internal") {
OpTextProgress Prog(*_config);
return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, &Prog);
}
if (solver != "internal")
return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, Progress);

if (Progress != NULL)
Progress->OverallProgress(0, 100, 1, _("Calculating upgrade"));

pkgDepCache::ActionGroup group(Cache);

@@ -131,8 +151,15 @@ static bool pkgAllUpgradeNoNewPackages(pkgDepCache &Cache)
if (I->CurrentVer != 0 && Cache[I].InstallVer != 0)
Cache.MarkInstall(I, false, 0, false);
}
return Fix.ResolveByKeep();

if (Progress != NULL)
Progress->Progress(50);

// resolve remaining issues via keep
bool const success = Fix.ResolveByKeep(Progress);
if (Progress != NULL)
Progress->Done();
return success;
}
/*}}}*/
// AllUpgradeWithNewInstalls - Upgrade + install new packages as needed /*{{{*/
@@ -141,13 +168,14 @@ static bool pkgAllUpgradeNoNewPackages(pkgDepCache &Cache)
* Upgrade as much as possible without deleting anything (useful for
* stable systems)
*/
static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache)
static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache, OpProgress * const Progress)
{
std::string const solver = _config->Find("APT::Solver", "internal");
if (solver != "internal") {
OpTextProgress Prog(*_config);
return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, &Prog);
}
if (solver != "internal")
return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, Progress);

if (Progress != NULL)
Progress->OverallProgress(0, 100, 1, _("Calculating upgrade"));

pkgDepCache::ActionGroup group(Cache);

@@ -170,18 +198,30 @@ static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache)
}
}

if (Progress != NULL)
Progress->Progress(10);

// then let auto-install loose
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
if (Cache[I].Install())
Cache.MarkInstall(I, true, 0, false);

if (Progress != NULL)
Progress->Progress(50);

// ... but it may remove stuff, we we need to clean up afterwards again
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
if (Cache[I].Delete() == true)
Cache.MarkKeep(I, false, false);

if (Progress != NULL)
Progress->Progress(60);

// resolve remaining issues via keep
return Fix.ResolveByKeep();
bool const success = Fix.ResolveByKeep(Progress);
if (Progress != NULL)
Progress->Done();
return success;
}
/*}}}*/
// AllUpgrade - Upgrade as many packages as possible /*{{{*/
@@ -189,9 +229,9 @@ static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache)
/* Right now the system must be consistent before this can be called.
It also will not change packages marked for install, it only tries
to install packages not marked for install */
bool pkgAllUpgrade(pkgDepCache &Cache)
bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress)
{
return pkgAllUpgradeNoNewPackages(Cache);
return pkgAllUpgradeNoNewPackages(Cache, Progress);
}
/*}}}*/
// MinimizeUpgrade - Minimizes the set of packages to be upgraded /*{{{*/
@@ -239,21 +279,15 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache)
return true;
}
/*}}}*/
// APT::Upgrade::Upgrade - Upgrade using a specific strategy /*{{{*/
bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode)
// APT::Upgrade::Upgrade - Upgrade using a specific strategy /*{{{*/
bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode, OpProgress * const Progress)
{
if (mode == 0)
{
return pkgDistUpgrade(Cache);
}
if (mode == 0)
return pkgDistUpgrade(Cache, Progress);
else if ((mode & ~FORBID_REMOVE_PACKAGES) == 0)
{
return pkgAllUpgradeWithNewPackages(Cache);
}
return pkgAllUpgradeWithNewPackages(Cache, Progress);
else if ((mode & ~(FORBID_REMOVE_PACKAGES|FORBID_INSTALL_NEW_PACKAGES)) == 0)
{
return pkgAllUpgradeNoNewPackages(Cache);
}
return pkgAllUpgradeNoNewPackages(Cache, Progress);
else
_error->Error("pkgAllUpgrade called with unsupported mode %i", mode);



+ 7
- 5
apt-pkg/upgrade.h View File

@@ -10,7 +10,10 @@
#ifndef PKGLIB_UPGRADE_H
#define PKGLIB_UPGRADE_H

#include <stddef.h>

class pkgDepCache;
class OpProgress;

namespace APT {
namespace Upgrade {
@@ -19,14 +22,13 @@ namespace APT {
FORBID_REMOVE_PACKAGES = 1,
FORBID_INSTALL_NEW_PACKAGES = 2
};
bool Upgrade(pkgDepCache &Cache, int UpgradeMode);
bool Upgrade(pkgDepCache &Cache, int UpgradeMode, OpProgress * const Progress = NULL);
}
}

// please use APT::Upgrade::Upgrade() instead
bool pkgDistUpgrade(pkgDepCache &Cache);
bool pkgAllUpgrade(pkgDepCache &Cache);
bool pkgMinimizeUpgrade(pkgDepCache &Cache);

bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);

bool pkgMinimizeUpgrade(pkgDepCache &Cache);
#endif

+ 7
- 4
apt-private/private-install.cc View File

@@ -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;


+ 0
- 2
apt-private/private-upgrade.cc View File

@@ -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);
}


+ 2
- 2
po/ar.po View File

@@ -1578,8 +1578,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "حساب الترقية..."
msgid "Calculating upgrade"
msgstr "حساب الترقية"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/ast.po View File

@@ -1706,8 +1706,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Calculando l'anovamientu... "
msgid "Calculating upgrade"
msgstr "Calculando l'anovamientu"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/bg.po View File

@@ -1743,8 +1743,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Изчисляване на актуализацията..."
msgid "Calculating upgrade"
msgstr "Изчисляване на актуализацията"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/bs.po View File

@@ -1575,8 +1575,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
msgid "Calculating upgrade"
msgstr "Računam nadogradnju"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/ca.po View File

@@ -1731,8 +1731,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització"
msgid "Calculating upgrade"
msgstr "S'està calculant l'actualització"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/cs.po View File

@@ -1757,8 +1757,8 @@ msgid "All packages are up to date."
msgstr "Všechny balíky jsou aktuální."

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Propočítává se aktualizace"
msgid "Calculating upgrade"
msgstr "Propočítává se aktualizace"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/cy.po View File

@@ -1731,8 +1731,8 @@ msgstr ""

#: apt-private/private-upgrade.cc:25
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
msgid "Calculating upgrade"
msgstr "Yn Cyfrifo'r Uwchraddiad"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/da.po View File

@@ -1771,8 +1771,8 @@ msgid "All packages are up to date."
msgstr "Alle pakker er opdateret."

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen ... "
msgid "Calculating upgrade"
msgstr "Beregner opgraderingen"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/de.po View File

@@ -1833,8 +1833,8 @@ msgid "All packages are up to date."
msgstr "Alle Pakete sind aktuell."

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
msgid "Calculating upgrade"
msgstr "Paketaktualisierung (Upgrade) wird berechnet"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/dz.po View File

@@ -1696,8 +1696,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
msgid "Calculating upgrade"
msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/el.po View File

@@ -1718,8 +1718,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
msgid "Calculating upgrade"
msgstr "Υπολογισμός της αναβάθμισης"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/es.po View File

@@ -1780,8 +1780,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Calculando la actualización... "
msgid "Calculating upgrade"
msgstr "Calculando la actualización"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/eu.po View File

@@ -1700,8 +1700,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
msgid "Calculating upgrade"
msgstr "Berriketak kalkulatzen"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/fi.po View File

@@ -1692,8 +1692,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
msgid "Calculating upgrade"
msgstr "Käsitellään päivitystä"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/fr.po View File

@@ -1788,8 +1788,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Calcul de la mise à jour... "
msgid "Calculating upgrade"
msgstr "Calcul de la mise à jour"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/gl.po View File

@@ -1729,8 +1729,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Calculando a anovación... "
msgid "Calculating upgrade"
msgstr "Calculando a anovación"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 1
- 1
po/he.po View File

@@ -1006,7 +1006,7 @@ msgid "Recommended packages:"
msgstr ""

#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgid "Calculating upgrade"
msgstr ""

#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112


+ 2
- 2
po/hu.po View File

@@ -1736,8 +1736,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
msgid "Calculating upgrade"
msgstr "Frissítés kiszámítása"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/it.po View File

@@ -1796,8 +1796,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento... "
msgid "Calculating upgrade"
msgstr "Calcolo dell'aggiornamento"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/ja.po View File

@@ -1765,8 +1765,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "アップグレードパッケージを検出しています ... "
msgid "Calculating upgrade"
msgstr "アップグレードパッケージを検出しています"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/km.po View File

@@ -1675,8 +1675,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
msgid "Calculating upgrade"
msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/ko.po View File

@@ -1688,8 +1688,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
msgid "Calculating upgrade"
msgstr "업그레이드를 계산하는 중입니다"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/ku.po View File

@@ -1578,8 +1578,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Bilindkirin tê hesibandin..."
msgid "Calculating upgrade"
msgstr "Bilindkirin tê hesibandin"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/lt.po View File

@@ -1600,8 +1600,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Skaičiuojami atnaujinimai... "
msgid "Calculating upgrade"
msgstr "Skaičiuojami atnaujinimai"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/mr.po View File

@@ -1679,8 +1679,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
msgid "Calculating upgrade"
msgstr "पुढिल आवृत्तीची गणती करीत आहे"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/nb.po View File

@@ -1706,8 +1706,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
msgid "Calculating upgrade"
msgstr "Beregner oppgradering"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/ne.po View File

@@ -1675,8 +1675,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "स्तर वृद्धि गणना गरिदैछ..."
msgid "Calculating upgrade"
msgstr "स्तर वृद्धि गणना गरिदैछ."

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/nl.po View File

@@ -1730,8 +1730,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
msgid "Calculating upgrade"
msgstr "Opwaardering wordt doorgerekend"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/nn.po View File

@@ -1691,8 +1691,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
msgid "Calculating upgrade"
msgstr "Reknar ut oppgradering"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/pl.po View File

@@ -1774,8 +1774,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
msgid "Calculating upgrade"
msgstr "Obliczanie aktualizacji"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/pt.po View File

@@ -1741,8 +1741,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "A calcular a actualização... "
msgid "Calculating upgrade"
msgstr "A calcular a actualização"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/pt_BR.po View File

@@ -1710,8 +1710,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Calculando atualização... "
msgid "Calculating upgrade"
msgstr "Calculando atualização"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/ro.po View File

@@ -1717,8 +1717,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
msgid "Calculating upgrade"
msgstr "Calculez înnoirea"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/ru.po View File

@@ -1764,8 +1764,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Расчёт обновлений"
msgid "Calculating upgrade"
msgstr "Расчёт обновлений"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/sk.po View File

@@ -1738,8 +1738,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
msgid "Calculating upgrade"
msgstr "Prepočítava sa aktualizácia"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/sl.po View File

@@ -1739,8 +1739,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Preračunavanje nadgradnje ... "
msgid "Calculating upgrade"
msgstr "Preračunavanje nadgradnje"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/sv.po View File

@@ -1723,8 +1723,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Beräknar uppgradering... "
msgid "Calculating upgrade"
msgstr "Beräknar uppgradering"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/th.po View File

@@ -1718,8 +1718,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "กำลังคำนวณการปรับรุ่น... "
msgid "Calculating upgrade"
msgstr "กำลังคำนวณการปรับรุ่น"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/tl.po View File

@@ -1700,8 +1700,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Sinusuri ang pag-upgrade... "
msgid "Calculating upgrade"
msgstr "Sinusuri ang pag-upgrade"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/tr.po View File

@@ -1779,8 +1779,8 @@ msgid "All packages are up to date."
msgstr "Tüm paketler güncel."

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Yükseltme hesaplanıyor... "
msgid "Calculating upgrade"
msgstr "Yükseltme hesaplanıyor"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/uk.po View File

@@ -1759,8 +1759,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Обчислення оновлень... "
msgid "Calculating upgrade"
msgstr "Обчислення оновлень"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/vi.po View File

@@ -1774,8 +1774,8 @@ msgid "All packages are up to date."
msgstr "Mọi gói đã được cập nhật."

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "Đang tính toán nâng cấp... "
msgid "Calculating upgrade"
msgstr "Đang tính toán nâng cấp"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/zh_CN.po View File

@@ -1669,8 +1669,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
msgid "Calculating upgrade"
msgstr "正在对升级进行计算"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 2
- 2
po/zh_TW.po View File

@@ -1669,8 +1669,8 @@ msgid "All packages are up to date."
msgstr ""

#: apt-private/private-upgrade.cc:25
msgid "Calculating upgrade... "
msgstr "籌備升級中... "
msgid "Calculating upgrade"
msgstr "籌備升級中"

#: apt-private/private-upgrade.cc:28
msgid "Done"


+ 6
- 0
test/integration/test-allow-scores-for-all-dependency-types View File

@@ -39,6 +39,7 @@ insertinstalledpackage 'libdb-dev' 'amd64' '5.1.7' 'Depends: libdb5.1-dev'
insertinstalledpackage 'libdb5.1-dev' 'amd64' '5.1.29-7'
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
libdb5.1-dev
The following NEW packages will be installed:
@@ -53,6 +54,7 @@ Conf libdb5.3-dev (5.3.28-3 unversioned [amd64])
Conf libdb-dev (5.3.0 unversioned [amd64])' aptget dist-upgrade -st unversioned
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
libdb5.1-dev
The following NEW packages will be installed:
@@ -71,21 +73,25 @@ insertinstalledpackage 'foo' 'amd64' '1'
insertinstalledpackage 'bar' 'amd64' '1'
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
bar foo
0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st unversioned
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
bar foo
0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st versioned
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
bar foo
0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st multipleno
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
foo
The following packages will be upgraded:


+ 3
- 0
test/integration/test-apt-get-upgrade View File

@@ -31,6 +31,7 @@ setupaptarchive
# Test if normal upgrade works as expected
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
upgrade-with-conflict upgrade-with-new-dep
The following packages will be upgraded:
@@ -42,6 +43,7 @@ Conf upgrade-simple (2.0 unstable [all])' aptget -s upgrade
# Test if apt-get upgrade --with-new-pkgs works
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following NEW packages will be installed:
new-dep
The following packages have been kept back:
@@ -59,6 +61,7 @@ Conf upgrade-with-new-dep (2.0 unstable [all])' aptget -s upgrade --with-new-pkg
# Test if apt-get dist-upgrade works
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
conflicting-dep
The following NEW packages will be installed:


+ 1
- 0
test/integration/test-bug-507998-dist-upgrade-recommends View File

@@ -16,6 +16,7 @@ setupaptarchive

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
tshark wireshark-common
2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.


+ 2
- 0
test/integration/test-bug-591882-conkeror View File

@@ -9,6 +9,7 @@ setupaptarchive

UPGRADEFAIL="Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
conkeror libdatrie0 libkrb53 libxcb-xlib0 xulrunner-1.9
The following NEW packages will be installed:
@@ -40,6 +41,7 @@ E: Trivial Only specified but this is not a trivial operation."

UPGRADESUCCESS="Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
libdatrie0 libkrb53 libxcb-xlib0 xulrunner-1.9
The following NEW packages will be installed:


+ 1
- 0
test/integration/test-bug-605394-versioned-or-groups View File

@@ -9,6 +9,7 @@ setupaptarchive

testequal "Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
php5 php5-cgi
2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.


+ 2
- 0
test/integration/test-bug-612099-multiarch-conflicts View File

@@ -70,6 +70,7 @@ Conf foobar (1.0 stable [i386])' aptget install foobar/stable libc6 -st testing
testequal 'Reading package lists...
Building dependency tree...
Reading state information...
Calculating upgrade...
The following packages will be upgraded:
libc6
1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
@@ -168,6 +169,7 @@ Conf libc6-same:amd64 (1.0 stable [amd64])' aptget install libc6-same:amd64 -s -
testequal 'Reading package lists...
Building dependency tree...
Reading state information...
Calculating upgrade...
The following packages will be upgraded:
libc6-same
1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.


+ 2
- 0
test/integration/test-bug-64141-install-dependencies-for-on-hold View File

@@ -21,6 +21,7 @@ setupaptarchive

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
oldcrap
The following NEW packages will be installed:
@@ -35,6 +36,7 @@ testsuccess aptmark hold apt

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
apt
The following packages will be upgraded:


+ 1
- 0
test/integration/test-bug-657695-resolver-breaks-on-virtuals View File

@@ -18,6 +18,7 @@ setupaptarchive

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
xserver-xorg-video-driver1 xserver-xorg-video-driver10
xserver-xorg-video-driver11 xserver-xorg-video-driver12


+ 1
- 0
test/integration/test-bug-675449-essential-are-protected View File

@@ -69,6 +69,7 @@ Purg pkg-none-foreign:i386 [1]' aptget purge pkg-none-foreign:i386 -s

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following NEW packages will be installed:
pkg-depends-new:i386 pkg-none-new
The following packages will be upgraded:


+ 4
- 0
test/integration/test-bug-680041-apt-mark-holds-correctly View File

@@ -19,6 +19,7 @@ runtests() {

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
pkgall pkgarch
2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
@@ -30,6 +31,7 @@ E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgr

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
pkgarch
The following packages will be upgraded:
@@ -43,6 +45,7 @@ E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgr

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
pkgall pkgarch
2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
@@ -54,6 +57,7 @@ E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgr

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
pkgall
The following packages will be upgraded:


+ 1
- 0
test/integration/test-bug-686346-package-missing-architecture View File

@@ -53,6 +53,7 @@ testnopackage pkge:*
# this difference seems so important that it has to be maintained …
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade -s

# pkgd has no update with an architecture


+ 2
- 0
test/integration/test-bug-735967-lib32-to-i386-unavailable View File

@@ -33,6 +33,7 @@ testsuccess aptget update

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
lib32nss-mdns
The following packages will be upgraded:
@@ -60,6 +61,7 @@ testsuccess aptget update

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following NEW packages will be installed:
libnss-mdns:i386 libnss-mdns-i386:i386
The following packages will be upgraded:


+ 2
- 0
test/integration/test-bug-740843-versioned-up-down-breaks View File

@@ -24,6 +24,7 @@ setupaptarchive

testequalor2 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
foo-driver libfoo libfoo:i386 libgl1-foo-glx libgl1-foo-glx:i386
5 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
@@ -38,6 +39,7 @@ Conf libgl1-foo-glx:i386 (2 stable [i386])
Conf libgl1-foo-glx (2 stable [amd64])
Conf foo-driver (2 stable [amd64])' 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
foo-driver libfoo libfoo:i386 libgl1-foo-glx libgl1-foo-glx:i386
5 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.


+ 1
- 0
test/integration/test-bug-758153-versioned-provides-support View File

@@ -28,6 +28,7 @@ setupaptarchive

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
webapp webserver
2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.


+ 1
- 0
test/integration/test-conflicts-loop View File

@@ -17,6 +17,7 @@ setupaptarchive

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib
3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.


+ 3
- 0
test/integration/test-pin-non-existent-package View File

@@ -26,6 +26,7 @@ testcandidate rapt '0.8.15'
testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only

echo 'Package: rapt
@@ -36,6 +37,7 @@ testcandidate rapt '(none)'
testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only

echo '
@@ -55,6 +57,7 @@ testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only

echo 'Package: arch:amd64


+ 1
- 0
test/integration/test-prevent-markinstall-multiarch-same-versionscrew View File

@@ -43,6 +43,7 @@ setupaptarchive

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
out-of-sync-gone-foreign:i386 out-of-sync-gone-native
The following packages have been kept back:


+ 1
- 0
test/integration/test-provides-gone-with-upgrade View File

@@ -15,6 +15,7 @@ setupaptarchive

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following NEW packages will be installed:
libapt-pkg4.10
The following packages will be upgraded:


+ 1
- 0
test/integration/test-resolve-by-keep-new-recommends View File

@@ -13,6 +13,7 @@ setupaptarchive

UPGRADE_KEEP="Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
foo
0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded."


+ 2
- 0
test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard View File

@@ -27,6 +27,7 @@ setupaptarchive
# discourage keeping obsolete high-priority packages …
testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
not-downloadable
The following packages will be upgraded:
@@ -43,6 +44,7 @@ done

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
upgradable
0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.' aptget -s dist-upgrade

+ 1
- 0
test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering View File

@@ -14,6 +14,7 @@ setupaptarchive

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
custom
1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.


+ 1
- 0
test/integration/test-very-tight-loop-configure-with-unpacking-new-packages View File

@@ -28,6 +28,7 @@ setupaptarchive

testequalor2 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following NEW packages will be installed:
ure
The following packages will be upgraded:


+ 2
- 0
test/integration/test-xorg-break-providers View File

@@ -26,6 +26,7 @@ E: Trivial Only specified but this is not a trivial operation.' aptget install x

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
xserver-xorg-core xserver-xorg-video-intel
2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
@@ -35,6 +36,7 @@ E: Trivial Only specified but this is not a trivial operation.' aptget upgrade -

testequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
xserver-xorg-core xserver-xorg-video-intel
2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.


Loading…
Cancel
Save