summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-12-30 03:54:36 +0000
committerZac Medico <zmedico@gentoo.org>2006-12-30 03:54:36 +0000
commitbab58cf5d43a0289d7c741b4aa62f83737798ea0 (patch)
tree47da7076de5c2ecdff254f34245cfcb7394c64ce /bin/emerge
parentSort the --info USE flags for bug #159161. (diff)
downloadportage-multirepo-bab58cf5d43a0289d7c741b4aa62f83737798ea0.tar.gz
portage-multirepo-bab58cf5d43a0289d7c741b4aa62f83737798ea0.tar.bz2
portage-multirepo-bab58cf5d43a0289d7c741b4aa62f83737798ea0.zip
Be slightly more defensive when loading the vdb/blockers caches.
svn path=/main/trunk/; revision=5421
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 17a54cbc..6e7cb555 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -844,8 +844,8 @@ class BlockerCache(DictMixin):
cache_valid = self._cache_data and \
isinstance(self._cache_data, dict) and \
self._cache_data.get("version") == self._cache_version and \
- self._cache_data["virtuals"] == self._virtuals and \
- set(self._cache_data["blockers"]) == self._installed_pkgs
+ self._cache_data.get("virtuals") == self._virtuals and \
+ set(self._cache_data.get("blockers", [])) == self._installed_pkgs
if cache_valid:
for pkg in self._installed_pkgs:
if long(self._vardb.aux_get(pkg, ["COUNTER"])[0]) != \