diff options
| -rw-r--r-- | apt-pkg/depcache.cc | 6 | ||||
| -rw-r--r-- | apt-pkg/depcache.h | 4 | ||||
| -rwxr-xr-x | test/integration/test-apt-showlist-orgroup-in-recommends | 6 | ||||
| -rwxr-xr-x | test/integration/test-release-candidate-switching | 58 |
4 files changed, 35 insertions, 39 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index dd18305d2..4940387a6 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1700,11 +1700,7 @@ void pkgDepCache::StateCache::Update(PkgIterator Pkg,pkgCache &Cache) CurVersion = ""; if (Pkg->CurrentVer != 0) CurVersion = Pkg.CurrentVer().VerStr(); - - // Strip off the epochs for display - CurVersion = StripEpoch(CurVersion); - CandVersion = StripEpoch(CandVersion); - + // Figure out if its up or down or equal Status = Ver.CompareVer(Pkg.CurrentVer()); if (Pkg->CurrentVer == 0 || Pkg->VersionList == 0 || CandidateVer == 0) diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 10f869f25..99d0e7a63 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -209,7 +209,7 @@ class pkgDepCache : protected pkgCache::Namespace struct StateCache { - // Epoch stripped text versions of the two version fields + // text versions of the two version fields const char *CandVersion; const char *CurVersion; @@ -240,7 +240,7 @@ class pkgDepCache : protected pkgCache::Namespace unsigned char DepState; // DepState Flags // Update of candidate version - const char *StripEpoch(const char *Ver) APT_PURE; + APT_DEPRECATED_MSG("Use the method of the same name in contrib/strutl.h instead if you must") const char *StripEpoch(const char *Ver) APT_PURE; void Update(PkgIterator Pkg,pkgCache &Cache); // Various test members for the current status of the package diff --git a/test/integration/test-apt-showlist-orgroup-in-recommends b/test/integration/test-apt-showlist-orgroup-in-recommends index a9d65e3bb..a03c367f4 100755 --- a/test/integration/test-apt-showlist-orgroup-in-recommends +++ b/test/integration/test-apt-showlist-orgroup-in-recommends @@ -125,8 +125,8 @@ testsuccessequal 'Reading package lists... Building dependency tree... Suggested packages: yyy (1) - | zzz (1) - zzz (1) + | zzz (1:1) + zzz (1:1) Recommended packages: xxx | yyy (1) @@ -142,7 +142,7 @@ Conf orgroup4 (1 unstable [all])' aptget install orgroup2 orgroup4 -s -V --no-in testsuccessequal 'Reading package lists... Building dependency tree... Suggested packages: - zzz (1) + zzz (1:1) Recommended packages: xxx The following NEW packages will be installed: diff --git a/test/integration/test-release-candidate-switching b/test/integration/test-release-candidate-switching index 1d1b4a774..d7f1c90f7 100755 --- a/test/integration/test-release-candidate-switching +++ b/test/integration/test-release-candidate-switching @@ -61,14 +61,14 @@ The following additional packages will be installed: amarok-utils (2.3.1-1+sid) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0really4.4.2-1+sid) + phonon-backend-xine (4:4.6.0really4.4.2-1+sid) The following NEW packages will be installed: amarok (2.3.1-1+sid) amarok-common (2.3.1-1+sid) amarok-utils (2.3.1-1+sid) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0really4.4.2-1+sid) + phonon-backend-xine (4:4.6.0really4.4.2-1+sid) 0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. After this operation, 258 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok --trivial-only -V @@ -80,14 +80,14 @@ The following additional packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.3+exp) - phonon-backend-xine (4.6.0+exp) + phonon-backend-xine (5:4.6.0+exp) The following NEW packages will be installed: amarok (2.3.2-2+exp) amarok-common (2.3.2-2+exp) amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.3+exp) - phonon-backend-xine (4.6.0+exp) + phonon-backend-xine (5:4.6.0+exp) 0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. After this operation, 258 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok -t experimental --trivial-only -V @@ -102,14 +102,14 @@ The following additional packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0really4.4.2-1+sid) + phonon-backend-xine (4:4.6.0really4.4.2-1+sid) The following NEW packages will be installed: amarok (2.3.2-2+exp) amarok-common (2.3.2-2+exp) amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0really4.4.2-1+sid) + phonon-backend-xine (4:4.6.0really4.4.2-1+sid) 0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. After this operation, 258 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok/experimental --trivial-only -V @@ -124,14 +124,14 @@ The following additional packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-null (4.20.0+sid) + phonon-backend-null (4:4.20.0+sid) The following NEW packages will be installed: amarok-common (2.3.2-2+exp) amarok-null (2.3.2-2+exp) amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-null (4.20.0+sid) + phonon-backend-null (4:4.20.0+sid) 0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. After this operation, 258 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok-null/experimental --trivial-only -V @@ -148,7 +148,7 @@ The following additional packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0really4.4.2-1+sid) + phonon-backend-xine (4:4.6.0really4.4.2-1+sid) The following NEW packages will be installed: amarok (2.3.2-2+exp) amarok-common (2.3.2-2+exp) @@ -156,7 +156,7 @@ The following NEW packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0really4.4.2-1+sid) + phonon-backend-xine (4:4.6.0really4.4.2-1+sid) 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. After this operation, 301 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok/experimental amarok-null/experimental --trivial-only -V @@ -178,7 +178,7 @@ The following additional packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0+exp) + phonon-backend-xine (5:4.6.0+exp) The following NEW packages will be installed: amarok-common (2.3.2-2+exp) amarok-higher (2.3.2-2+exp) @@ -186,7 +186,7 @@ The following NEW packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0+exp) + phonon-backend-xine (5:4.6.0+exp) 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. After this operation, 301 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok-less/experimental2 amarok-higher/experimental --trivial-only -V @@ -202,14 +202,14 @@ The following additional packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-null (4.20.0+sid) + phonon-backend-null (4:4.20.0+sid) The following NEW packages will be installed: amarok-common (2.3.2-2+exp) amarok-null2 (2.3.2-2+exp) amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-null (4.20.0+sid) + phonon-backend-null (4:4.20.0+sid) 0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. After this operation, 258 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok-null2/experimental --trivial-only -V @@ -226,14 +226,14 @@ The following additional packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0+exp) + phonon-backend-xine (5:4.6.0+exp) The following NEW packages will be installed: amarok-common (2.3.2-2+exp) amarok-utils (2.3.2-2+exp) amarok-xine (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0+exp) + phonon-backend-xine (5:4.6.0+exp) 0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. After this operation, 258 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine/experimental --trivial-only -V @@ -250,14 +250,14 @@ The following additional packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-null (4.20.0+exp) + phonon-backend-null (5:4.20.0+exp) The following NEW packages will be installed: amarok-common (2.3.2-2+exp) amarok-utils (2.3.2-2+exp) amarok-xine2 (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-null (4.20.0+exp) + phonon-backend-null (5:4.20.0+exp) 0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. After this operation, 258 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine2/experimental --trivial-only -V @@ -276,7 +276,7 @@ The following additional packages will be installed: intermediatepkg (2.0) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine3 (4.6.0+exp) + phonon-backend-xine3 (5:4.6.0+exp) The following NEW packages will be installed: amarok-common (2.3.2-2+exp) amarok-utils (2.3.2-2+exp) @@ -284,7 +284,7 @@ The following NEW packages will be installed: intermediatepkg (2.0) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine3 (4.6.0+exp) + phonon-backend-xine3 (5:4.6.0+exp) 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. After this operation, 301 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine3/experimental --trivial-only -V @@ -301,14 +301,14 @@ The following additional packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-null (4.20.0+exp) + phonon-backend-null (5:4.20.0+exp) The following NEW packages will be installed: amarok-common (2.3.2-2+exp) amarok-utils (2.3.2-2+exp) amarok-xine4 (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-null (4.20.0+exp) + phonon-backend-null (5:4.20.0+exp) 0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. After this operation, 258 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine4/experimental --trivial-only -V @@ -325,14 +325,14 @@ The following additional packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-null (4.20.0+exp) + phonon-backend-null (5:4.20.0+exp) The following NEW packages will be installed: amarok-broken (2.3.2-2+exp) amarok-common (2.3.2-2+exp) amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-null (4.20.0+exp) + phonon-backend-null (5:4.20.0+exp) 0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. After this operation, 258 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok-broken/experimental --trivial-only -V @@ -348,14 +348,14 @@ The following additional packages will be installed: amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0really4.4.2-1+sid) + phonon-backend-xine (4:4.6.0really4.4.2-1+sid) The following NEW packages will be installed: amarok-common (2.3.2-2+exp) amarok-recommends (2.3.2-2+exp) amarok-utils (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0really4.4.2-1+sid) + phonon-backend-xine (4:4.6.0really4.4.2-1+sid) 0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded. After this operation, 258 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok-recommends/experimental --trivial-only -V -o APT::Install-Recommends=1 @@ -369,7 +369,7 @@ The following additional packages will be installed: amarok-common (2.3.2-2+exp) Recommended packages: amarok-utils (2.3.1-1+sid) - phonon-backend-xine (4.6.0really4.4.2-1+sid) + phonon-backend-xine (4:4.6.0really4.4.2-1+sid) | phonon-backend libmtp8 (0.3.1+sid) libc6 (2.11.2-7+sid) @@ -390,7 +390,7 @@ The following additional packages will be installed: amarok-common (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0really4.4.2-1+sid) + phonon-backend-xine (4:4.6.0really4.4.2-1+sid) Recommended packages: amarok-utils (2.3.1-1+sid) The following NEW packages will be installed: @@ -398,7 +398,7 @@ The following NEW packages will be installed: amarok-recommends2 (2.3.2-2+exp) libc6 (2.11.2-7+sid) libmtp8 (0.3.1+sid) - phonon-backend-xine (4.6.0really4.4.2-1+sid) + phonon-backend-xine (4:4.6.0really4.4.2-1+sid) 0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. After this operation, 215 kB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." aptget install amarok-recommends2/experimental --trivial-only -V -o APT::Install-Recommends=1 |