summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/policy.cc2
-rwxr-xr-xtest/integration/test-phased-updates6
2 files changed, 4 insertions, 4 deletions
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 39879f754..1179f422d 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -310,7 +310,7 @@ static inline bool ExcludePhased(std::string machineID, pkgCache::VerIterator co
}
APT_PURE signed short pkgPolicy::GetPriority(pkgCache::VerIterator const &Ver, bool ConsiderFiles)
{
- if (Ver.ParentPkg()->CurrentVer && Ver.PhasedUpdatePercentage() != 100)
+ if (Ver.PhasedUpdatePercentage() != 100)
{
if (ExcludePhased(d->machineID, Ver))
return 1;
diff --git a/test/integration/test-phased-updates b/test/integration/test-phased-updates
index 50f151f79..c06d6f5a1 100755
--- a/test/integration/test-phased-updates
+++ b/test/integration/test-phased-updates
@@ -59,7 +59,7 @@ phased3:
500 file:${TMPWORKINGDIRECTORY}/aptarchive unstable/main all Packages
50 500 (phased 50%)
500 file:${TMPWORKINGDIRECTORY}/aptarchive unstable/main all Packages
- 10 500 (phased 10%)
+ 10 1 (phased 10%)
500 file:${TMPWORKINGDIRECTORY}/aptarchive unstable/main all Packages" aptcache policy phased1 phased2 phased3
msgmsg "Test for always-include-phased-updates"
@@ -132,9 +132,9 @@ phased3:
Version table:
100 500
500 file:${TMPWORKINGDIRECTORY}/aptarchive unstable/main all Packages
- 50 500 (phased 50%)
+ 50 1 (phased 50%)
500 file:${TMPWORKINGDIRECTORY}/aptarchive unstable/main all Packages
- 10 500 (phased 10%)
+ 10 1 (phased 10%)
500 file:${TMPWORKINGDIRECTORY}/aptarchive unstable/main all Packages" aptcache policy phased1 phased2 phased3 -o $never=true
done