summaryrefslogtreecommitdiff
path: root/apt-pkg/policy.cc
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2015-08-20 11:56:09 +0200
committerJulian Andres Klode <jak@debian.org>2015-08-20 14:54:03 +0200
commit632f24768e4fdcebe4e26e02471beb8f583e073b (patch)
treed107e3f10191f7d595610af5dca8047ea7b85f72 /apt-pkg/policy.cc
parentf5c0ab925fdceb1bc0ef0e958cae7d0fafb28caf (diff)
Re-indent GetCandidateVerNew() and make ConsiderFiles argument explicit
Gbp-Dch: ignore
Diffstat (limited to 'apt-pkg/policy.cc')
-rw-r--r--apt-pkg/policy.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 91ad1d5bf..a1e903178 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -236,15 +236,15 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVerNew(pkgCache::PkgIterator const
pkgVersioningSystem *vs = Cache->VS;
for (pkgCache::VerIterator ver = Pkg.VersionList(); ver.end() == false; ver++) {
- int priority = GetPriority(ver);
+ int priority = GetPriority(ver, true);
- if (priority == 0 || priority <= candPriority)
- continue;
+ if (priority == 0 || priority <= candPriority)
+ continue;
- // TODO: Maybe optimize to not compare versions
- if (!cur.end() && priority < 1000
- && (vs->CmpVersion(ver.VerStr(), cur.VerStr()) < 0))
- continue;
+ // TODO: Maybe optimize to not compare versions
+ if (!cur.end() && priority < 1000
+ && (vs->CmpVersion(ver.VerStr(), cur.VerStr()) < 0))
+ continue;
candPriority = priority;
cand = ver;