commit: 89a48c206f007d4b1e323c089842cd6475c1eea2
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 16:25:45 2015 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 17:54:24 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=89a48c20
VdbMetadataDelta.applyDelta: remove replaced versions (bug 547532)
Since commit d800d224ab38c0f524d3fe858ebe201cbfa903c1, emerge --search
could randomly report incorrect results for the installed version
due to the replaced version of a given slot remaining in the cache.
Fixes: d800d224ab38 ("Log changes between vdb_metadata.pickle updates")
X-Gentoo-Bug: 547532
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=547532
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>
pym/_emerge/search.py | 10 ++++++++--
pym/portage/dbapi/_VdbMetadataDelta.py | 22 +++++++++++++++++++++-
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/pym/_emerge/search.py b/pym/_emerge/search.py
index e7f6f44..5a8143c 100644
--- a/pym/_emerge/search.py
+++ b/pym/_emerge/search.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import unicode_literals
@@ -442,7 +442,13 @@ class search(object):
def getInstallationStatus(self,package):
installed_package = self._vardb.match(package)
if installed_package:
- installed_package = installed_package[-1]
+ try:
+ self._vardb.match_unordered
+ except AttributeError:
+ installed_package = installed_package[-1]
+ else:
+ installed_package =
portage.best(installed_package)
+
else:
installed_package = ""
result = ""
diff --git a/pym/portage/dbapi/_VdbMetadataDelta.py
b/pym/portage/dbapi/_VdbMetadataDelta.py
index 3e3ff18..2dbb07a 100644
--- a/pym/portage/dbapi/_VdbMetadataDelta.py
+++ b/pym/portage/dbapi/_VdbMetadataDelta.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Gentoo Foundation
+# Copyright 2014-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import errno
@@ -8,6 +8,7 @@ import os
from portage import _encodings
from portage.util import atomic_ofstream
+from portage.versions import cpv_getkey
class VdbMetadataDelta(object):
@@ -138,10 +139,12 @@ class VdbMetadataDelta(object):
def applyDelta(self, data):
packages = self._vardb._aux_cache["packages"]
+ added_slots = {}
for delta in data["deltas"]:
cpv = delta["package"] + "-" + delta["version"]
event = delta["event"]
if event == "add":
+ added_slots[cpv] = delta
# Use aux_get to populate the cache
# for this cpv.
if cpv not in packages:
@@ -151,3 +154,20 @@ class VdbMetadataDelta(object):
pass
elif event == "remove":
packages.pop(cpv, None)
+
+ # Remove replaced versions from updated slots
+ for cached_cpv, (mtime, metadata) in list(packages.items()):
+ if cached_cpv in added_slots:
+ continue
+ replaced = False
+ for cpv, delta in added_slots.items():
+ if (cached_cpv.startswith(delta["package"]) and
+ metadata.get("SLOT") == delta["slot"]
and
+ cpv_getkey(cached_cpv) ==
delta["package"]):
+ replaced = True
+ break
+ if replaced:
+ del packages[cached_cpv]
+ del added_slots[cpv]
+ if not added_slots:
+ break
