summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-07-26 10:53:32 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-07-26 10:53:32 +0200
commitf1a58ff8b6cb4086ae59a2c6b02a29baf97ac116 (patch)
treeaa9a231f27d4d032b7d2db8c00d52dc2533ec754
parenta5032f842366f482371173d030e505d79366fd19 (diff)
- add a 'newest' pseudo target release as in pkg/newest
*
-rw-r--r--apt-pkg/cacheset.cc7
-rw-r--r--debian/changelog4
2 files changed, 9 insertions, 2 deletions
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index df7e99fd0..f17a9e0d5 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -323,7 +323,12 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg,
V = getInstalledVer(Cache, P, helper);
else if (ver == "candidate")
V = getCandidateVer(Cache, P, helper);
- else {
+ else if (ver == "newest") {
+ if (P->VersionList != 0)
+ V = P.VersionList();
+ else
+ V = helper.canNotFindNewestVer(Cache, P);
+ } else {
pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release :
pkgVersionMatch::Version));
V = Match.Find(P);
diff --git a/debian/changelog b/debian/changelog
index 1aa05adcb..a381034c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,12 +7,14 @@ apt (0.7.26~exp11) experimental; urgency=low
- be able to omit dependency types in (r)depends (Closes: #319006)
* apt-pkg/cacheset.cc:
- move them back to the library as they look stable now
+ - add a 'newest' pseudo target release as in pkg/newest
* apt-pkg/pkgcache.cc:
- prefer non-virtual packages in FindPreferredPkg (Closes: #590041)
* test/integration/*:
- add with bug#590041 testcase a small test "framework"
+ *
- -- David Kalnischkies <kalnischkies@gmail.com> Sun, 25 Jul 2010 19:37:45 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Mon, 26 Jul 2010 10:52:14 +0200
apt (0.7.26~exp10) experimental; urgency=low