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.

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 608ec7fce2ac6dbd14d94ca4767d37aa57f31d7a..71b5ac2c1607087668229fe49678bed00cfbde91 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -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();
 }
                                                                        /*}}}*/

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index f35bd9a133840b02a7835fc164a317b08d1166ec..4d3bfa81fe02086fef948714c387e88caba5f358 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -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();
 

diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc
index 29b11937b391fd8164a6ccca1e3e2a9957351351..20a38ecee189dfe42a9fd275f220027f15cad9c1 100644 (file)
--- a/apt-pkg/upgrade.cc
+++ b/apt-pkg/upgrade.cc
@@ -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);
 

diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h
index aa883df10aab1fe9d794042629d0a7e0932a336b..894f0625e3f9ee8d5c6a35e2537e31f5414e4d9f 100644 (file)
--- a/apt-pkg/upgrade.h
+++ b/apt-pkg/upgrade.h
@@ -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

diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index 55893bda05941e503611102b96e5cb68a7cbdf05..656b972339b124c39a9193dffa75e92bf3dc0e56 100644 (file)
--- 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 31f0675767a06ee97e96c5e6853a785a63594854..2a6dcc1533a29e5de82e8d85147ee698def05f9d 100644 (file)
--- 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);
 }

diff --git a/po/ar.po b/po/ar.po
index c4069143ead4958235815482e3ca7537076e5826..2ab648323d99276b410bb59a507d380c5a678a70 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -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"

diff --git a/po/ast.po b/po/ast.po
index 629c8f2da0495da764b8bc666a32431de568507d..a2f5a7df685542887a28f36e11b920fe392b3bf7 100644 (file)
--- a/po/ast.po
+++ b/po/ast.po
@@ -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"

diff --git a/po/bg.po b/po/bg.po
index ea73825135e27594be5b1caee96981e1fb9edf25..ad174d0a840397190ef9816ba65ed4a3ea2e100e 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -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"

diff --git a/po/bs.po b/po/bs.po
index 3cf69f0b1f2eb91c505691a3804aaca88e6746d7..5f03012fca26d3a3d37b2ff86d50b165e2427d15 100644 (file)
--- a/po/bs.po
+++ b/po/bs.po
@@ -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"

diff --git a/po/ca.po b/po/ca.po
index 31961ecac7b6d3a5dc3f07e832b18a0e888b9202..ee9ee46d4c205fef3fe73f5a8a2c327b9b9392a1 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -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"

diff --git a/po/cs.po b/po/cs.po
index 5bb6a79b70a28882ed9f41fc4507ab494d6b1140..4e43807b7c945158f67d1d6e23f81687ad5e6644 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -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"

diff --git a/po/cy.po b/po/cy.po
index dbf4bfba9a6c372012a39242439a42bcd7556e79..3175bfa574512aeca0a993e562b58343b8e90bd2 100644 (file)
--- a/po/cy.po
+++ b/po/cy.po
@@ -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"

diff --git a/po/da.po b/po/da.po
index 11ef78a5e4ff2d1eb9bae731bab03256a820ac2e..f46a851da7f11e609e5a6d08c8344830273a0983 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -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"

diff --git a/po/de.po b/po/de.po
index ae3b15d4142ab1f853e0302983a26e1854d69142..aef7c8fc4e0023f79da86ebba4f332d1dd2563c9 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -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"

diff --git a/po/dz.po b/po/dz.po
index 3ed665f94472b173e582c844adfd3f8d400ca8d4..59ed4305e91addb5d73f5309cf167bbe144ea846 100644 (file)
--- a/po/dz.po
+++ b/po/dz.po
@@ -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"

diff --git a/po/el.po b/po/el.po
index 92f178b0d7203cbcc197bc44f717978d220eb12e..86ef141796b4e873cd4bace1d7535a0aa4af5cfb 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -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"

diff --git a/po/es.po b/po/es.po
index 4717745903fcb2f7195058c355d0ffb553f747fc..77cee1d5d44d05ce0c69033cf1d8bdb8c4b49d31 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -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"

diff --git a/po/eu.po b/po/eu.po
index 9379abad0f95f60edc5ebfb29aaa7ff7223a0284..88561d003be059b33060393b07efa83a4b7c268c 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
@@ -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"

diff --git a/po/fi.po b/po/fi.po
index cb23ace3516fde0c77a3264f876a61d8ec2448b7..b18648579a05290aef6a6358c3487fb7d51c9a83 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -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"

diff --git a/po/fr.po b/po/fr.po
index f3b69a800808ebb332014830962e766afa39b646..b2197906e0ec3bebffd187fb265a5833cbb00c70 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -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"

diff --git a/po/gl.po b/po/gl.po
index e7aa787130f04ba3b38c8da26e003c5ce5a71be9..53a866bc1d1b88a0ca7371b11b8f15ae2d786d0c 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -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"

diff --git a/po/he.po b/po/he.po
index adc738becbe966e8580cc1fb50e29d6a1e00f010..4a44bc72d02bc22a4e5936c48dae390167c7335b 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -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

diff --git a/po/hu.po b/po/hu.po
index 9457b384c1950fa21f13907b3f48da09b665e10e..26a1bfa5cc7b76a01c4d424bb0d77328966d0f2d 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -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"

diff --git a/po/it.po b/po/it.po
index 5348110c24b51efdd2d5c0668c403f9c6c7cbb36..c0ad782a72d5277166040cda5284fdecc0038529 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -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"

diff --git a/po/ja.po b/po/ja.po
index c79bfbf285cbf256eb191d2772b272e6e9c13cfb..c62ff95f7e9d2936e2a15b050fafb2e0f2e80768 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -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"

diff --git a/po/km.po b/po/km.po
index 9202b6072c73c0ed5414a8ed8abebdf62d6b8faf..0e95cd9850ddd55d46ba577413a9639da2342a03 100644 (file)
--- a/po/km.po
+++ b/po/km.po
@@ -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"

diff --git a/po/ko.po b/po/ko.po
index c1b756cf75f52b1cbe4d930db97c4df42690acae..7ec20a7e7fa1a30166f3ebdcd6f8a311c7d4ac3a 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -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"

diff --git a/po/ku.po b/po/ku.po
index 5f5512065f1334b74c5ef32a3c4c2392197a8593..95c84ae0d32a62b4892129c74bb45ca7d310c39d 100644 (file)
--- a/po/ku.po
+++ b/po/ku.po
@@ -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"

diff --git a/po/lt.po b/po/lt.po
index 2f6d713655acb5850f851d0db578c37f3c129286..9c1c549a33718d4fde2734a4c62a418740405201 100644 (file)
--- a/po/lt.po
+++ b/po/lt.po
@@ -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"

diff --git a/po/mr.po b/po/mr.po
index 25134d605c58a4ed6d16c08ec8050000dbd5be5c..6dd53b8a799757ac145cb89ceac925e3a215ddc6 100644 (file)
--- a/po/mr.po
+++ b/po/mr.po
@@ -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"

diff --git a/po/nb.po b/po/nb.po
index 445f1cca5c07c303f8c7056f1a1cfb48a033e4e0..bc1e296d7cf2b2a6c3a38e2cba18594af56ae10e 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -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"

diff --git a/po/ne.po b/po/ne.po
index 08de0f8ef311f5e6f62055b2df8f227e756e0737..7c0d06837113cd3099c3476e184637935211787f 100644 (file)
--- a/po/ne.po
+++ b/po/ne.po
@@ -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"

diff --git a/po/nl.po b/po/nl.po
index c410baa46e4ca7fc9fef8e8326d604152cadb5fb..12e1602b90902570fc0157bfc07338112cd36b56 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -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"

diff --git a/po/nn.po b/po/nn.po
index 7c5f77759852a8ceb1b34c1c34d9c1281d1d7892..aeec419408631de1a40e69168d6298d9c1ccded7 100644 (file)
--- a/po/nn.po
+++ b/po/nn.po
@@ -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"

diff --git a/po/pl.po b/po/pl.po
index 95785904ad36c341ac32f8ae8dd5235eed67c5b2..d3829cb6d587b35322fcdb738e616acd45c9fc02 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -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"

diff --git a/po/pt.po b/po/pt.po
index 5dcd74bb519c12690477f20e5022bccdef8ff9e4..589af3181175822d407a3d4c55789def6c45ee3e 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -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"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index c23a42275ab7d5849b355025fee4b13bb189c53f..87575301acebb147ef4439552653572315b92462 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -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"

diff --git a/po/ro.po b/po/ro.po
index 2e556ef623553c16b0e50d790088f2b63c78105e..43c5bce6995330ffc64c3e86628936ee03dadf2c 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -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"

diff --git a/po/ru.po b/po/ru.po
index 93d5163fb21ab05989ffeb73910e8978f9eec11e..f24e513e629941d5866d4b9e433eda3e290b2433 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -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"

diff --git a/po/sk.po b/po/sk.po
index acfd4cf5bdf85a82a0d62f524b604774111a5f6f..a9f4d2695c2a9fd171fa36f407b2dd8bdb85b9af 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -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"

diff --git a/po/sl.po b/po/sl.po
index 69bf678d0800f789dcffdb2d985186c2befa12bb..dcca81d87511b478dd8cdb672e3a9fcad576f4b9 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -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"

diff --git a/po/sv.po b/po/sv.po
index 5d11f06c29fe832752d9c95d067d9d856b8715fb..b08ceb29fe409c176f7761772e7932832970386e 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -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"

diff --git a/po/th.po b/po/th.po
index 5d04c5cda6a6ff0665aeaf724a39fb51ba0fccd4..b6d436a9a9b3f7985cfa06844524aa4f0b26aef3 100644 (file)
--- a/po/th.po
+++ b/po/th.po
@@ -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"

diff --git a/po/tl.po b/po/tl.po
index 49a96a24e725cccc75b4fc393e1296da852b5c27..e240e377abc91c4c4f496329b2ab677958a273ad 100644 (file)
--- a/po/tl.po
+++ b/po/tl.po
@@ -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"

diff --git a/po/tr.po b/po/tr.po
index a3cd7077f6144719b3d80806836cba39ce223748..3aec2d65ffded2a03d99dcec15c96bd6c76acd13 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -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"

diff --git a/po/uk.po b/po/uk.po
index 4f7b34a3775041402d2ee3320e51ead039ef862c..a5c7d7cf86dda9bc3dd922348705cc6bbc914047 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -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"

diff --git a/po/vi.po b/po/vi.po
index 71dcfa55343a28770cae99840b2252ee6b62d934..87ec3b722a384ab23386ffb630eaef45d9ce23fc 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -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"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 67e69f716703711173af418805495d9347dcaca5..c06970a016549564ef626876f9c34c18ab277937 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -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"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 59a8dcac79d15f37cd302e1903db312bb1c56580..9d6b7d2ea0a5492e6f6d63234a0227451eeda6be 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -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"

diff --git a/test/integration/test-allow-scores-for-all-dependency-types b/test/integration/test-allow-scores-for-all-dependency-types
index a5c98f3d631c60fec1caf3613a90a6b3df22aa92..d1bcf1130d67ec7a6baef3d618ccc5726f8f48cd 100755 (executable)
--- a/test/integration/test-allow-scores-for-all-dependency-types
+++ b/test/integration/test-allow-scores-for-all-dependency-types
@@ -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:

diff --git a/test/integration/test-apt-get-upgrade b/test/integration/test-apt-get-upgrade
index 23446299ca8b5b2dfd394928a9a17111793746e7..5335c243aa240c1460da3ef2aafdc3ac1a9f2a02 100755 (executable)
--- a/test/integration/test-apt-get-upgrade
+++ b/test/integration/test-apt-get-upgrade
@@ -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:

diff --git a/test/integration/test-bug-507998-dist-upgrade-recommends b/test/integration/test-bug-507998-dist-upgrade-recommends
index 513421a94d353d80f20bbf23f9f324a7d12b8cfb..f3b4e04fbd323b5905d728f47620a047396ca389 100755 (executable)
--- a/test/integration/test-bug-507998-dist-upgrade-recommends
+++ b/test/integration/test-bug-507998-dist-upgrade-recommends
@@ -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.

diff --git a/test/integration/test-bug-591882-conkeror b/test/integration/test-bug-591882-conkeror
index e1c0b42d179302ce94a3366ef6aa34f885d54d45..891ddb8b7dd4fe6b9ba7530f9278fe4584767074 100755 (executable)
--- a/test/integration/test-bug-591882-conkeror
+++ b/test/integration/test-bug-591882-conkeror
@@ -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:

diff --git a/test/integration/test-bug-605394-versioned-or-groups b/test/integration/test-bug-605394-versioned-or-groups
index 0f09d29279b0dbae9cb4282f22afa6edbc0a8a4d..bb72d59e329c3f193644bbece223ed728a05a72c 100755 (executable)
--- a/test/integration/test-bug-605394-versioned-or-groups
+++ b/test/integration/test-bug-605394-versioned-or-groups
@@ -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.

diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts
index 20dc3a7e576b2fba5560ff1283c19dd6b148d879..c32600037997473fbdae67b0f5e5a7e97ff79647 100755 (executable)
--- a/test/integration/test-bug-612099-multiarch-conflicts
+++ b/test/integration/test-bug-612099-multiarch-conflicts
@@ -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.

diff --git a/test/integration/test-bug-64141-install-dependencies-for-on-hold b/test/integration/test-bug-64141-install-dependencies-for-on-hold
index 9a9e7be10e162a0b763155d82993041e2d130b5b..9e6c223a8ca5671028f119fb6110a097ac0afcae 100755 (executable)
--- a/test/integration/test-bug-64141-install-dependencies-for-on-hold
+++ b/test/integration/test-bug-64141-install-dependencies-for-on-hold
@@ -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:

diff --git a/test/integration/test-bug-657695-resolver-breaks-on-virtuals b/test/integration/test-bug-657695-resolver-breaks-on-virtuals
index e9b27cfcd04a0497f104d5d775ff02d880e95314..1b92a04feea180009cc3844d49153b6f22e1f116 100755 (executable)
--- a/test/integration/test-bug-657695-resolver-breaks-on-virtuals
+++ b/test/integration/test-bug-657695-resolver-breaks-on-virtuals
@@ -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

diff --git a/test/integration/test-bug-675449-essential-are-protected b/test/integration/test-bug-675449-essential-are-protected
index 7d8cc3484cd3c84e3312f750efd671a10f1ea6d6..2a27c62b183cea66e1d3c6c54d78a3be873aaab9 100755 (executable)
--- a/test/integration/test-bug-675449-essential-are-protected
+++ b/test/integration/test-bug-675449-essential-are-protected
@@ -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:

diff --git a/test/integration/test-bug-680041-apt-mark-holds-correctly b/test/integration/test-bug-680041-apt-mark-holds-correctly
index 2e5e39c8ed39e72f47060a6fb81d82c6503c1d0e..3f40c23dce883273b8eea3e76b832e4c33c9a321 100755 (executable)
--- a/test/integration/test-bug-680041-apt-mark-holds-correctly
+++ b/test/integration/test-bug-680041-apt-mark-holds-correctly
@@ -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:

diff --git a/test/integration/test-bug-686346-package-missing-architecture b/test/integration/test-bug-686346-package-missing-architecture
index dc51861ab276386b52785b062a2368bc1829ef7f..8024f81dae56f573ba48b243142e92a43671b554 100755 (executable)
--- a/test/integration/test-bug-686346-package-missing-architecture
+++ b/test/integration/test-bug-686346-package-missing-architecture
@@ -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

diff --git a/test/integration/test-bug-735967-lib32-to-i386-unavailable b/test/integration/test-bug-735967-lib32-to-i386-unavailable
index e9f3bf96dde0dabd743d7e88aeeb8fea5cc8cbbd..826931fe45d1e34beb00699d60f2ee793d7c2ae4 100755 (executable)
--- a/test/integration/test-bug-735967-lib32-to-i386-unavailable
+++ b/test/integration/test-bug-735967-lib32-to-i386-unavailable
@@ -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:

diff --git a/test/integration/test-bug-740843-versioned-up-down-breaks b/test/integration/test-bug-740843-versioned-up-down-breaks
index cb035a71f444c2761c63087731a61897d565a77a..9426ffad1491731973408bf87290ddb6db0e4b20 100755 (executable)
--- a/test/integration/test-bug-740843-versioned-up-down-breaks
+++ b/test/integration/test-bug-740843-versioned-up-down-breaks
@@ -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.

diff --git a/test/integration/test-bug-758153-versioned-provides-support b/test/integration/test-bug-758153-versioned-provides-support
index 2904ae5a14b3ad5540f83d0c86f9d1201f0969cd..21f9123c94375ec03a00d96e89906201dda2e339 100755 (executable)
--- a/test/integration/test-bug-758153-versioned-provides-support
+++ b/test/integration/test-bug-758153-versioned-provides-support
@@ -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.

diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop
index a2c411aafacb112130f54728dca719690e69706b..0906ef8fa4d4c8db2e7fd5022ceb89c5082445e7 100755 (executable)
--- a/test/integration/test-conflicts-loop
+++ b/test/integration/test-conflicts-loop
@@ -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.

diff --git a/test/integration/test-pin-non-existent-package b/test/integration/test-pin-non-existent-package
index 35de221155ea30b6cbff0edccf0fae9cb746490c..c567e528569fe2ff7b62f60734f0a6fc43b218fd 100755 (executable)
--- a/test/integration/test-pin-non-existent-package
+++ b/test/integration/test-pin-non-existent-package
@@ -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

diff --git a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
index d647856cb844bee54b0a76c7b14e4919e1ebcaf7..9d2ea2d5da6f44e47da76ec65239203169073ae2 100755 (executable)
--- a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
+++ b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
@@ -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:

diff --git a/test/integration/test-provides-gone-with-upgrade b/test/integration/test-provides-gone-with-upgrade
index 70384ce297dbc7209a620751af33e268ee1fb586..3b4bc2d045d71c6395679832815b2fcf51e919b0 100755 (executable)
--- a/test/integration/test-provides-gone-with-upgrade
+++ b/test/integration/test-provides-gone-with-upgrade
@@ -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:

diff --git a/test/integration/test-resolve-by-keep-new-recommends b/test/integration/test-resolve-by-keep-new-recommends
index 8134b76aaac84a6d7f2a286c35e970480c0a96b4..6b177287718150516ad25a4c83d56628fbbbbe92 100755 (executable)
--- a/test/integration/test-resolve-by-keep-new-recommends
+++ b/test/integration/test-resolve-by-keep-new-recommends
@@ -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."

diff --git a/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard b/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
index 2f2d384e1d3b58915551e44f1fd13360929c7e07..45f70a898aec9b6e5cf7b784a74b87aa94d6d66c 100755 (executable)
--- a/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
+++ b/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
@@ -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

diff --git a/test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering b/test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering
index 462acad00c025166309b6ca5c595a99e471b6c95..d2b6b9bad1e85eb6faee49304dc85ed95ca3590e 100755 (executable)
--- a/test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering
+++ b/test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering
@@ -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.

diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
index c1d454f883cf8067c537807768aebdd5dfb91453..2027166366adb8eea815bfac46c449e7e83e2439 100755 (executable)
--- a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
+++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
@@ -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:

diff --git a/test/integration/test-xorg-break-providers b/test/integration/test-xorg-break-providers
index 139d2c915326fef9649f0375010f1787bec4a234..0be57d97937e2e41dad01a24692455b786aee44f 100755 (executable)
--- a/test/integration/test-xorg-break-providers
+++ b/test/integration/test-xorg-break-providers
@@ -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.