aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pym/portage/emaint/modules/binhost/binhost.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage/emaint/modules/binhost/binhost.py b/pym/portage/emaint/modules/binhost/binhost.py
index f18878c7c..1c9006386 100644
--- a/pym/portage/emaint/modules/binhost/binhost.py
+++ b/pym/portage/emaint/modules/binhost/binhost.py
@@ -122,14 +122,14 @@ class BinhostHandler(object):
pkgindex_lock = locks.lockfile(
self._pkgindex_file, wantnewlockfile=1)
try:
- # Repopulate with lock held.
- bintree._populate_local()
+ # Repopulate with lock held. If _populate_local returns
+ # data then use that, since _load_pkgindex would return
+ # stale data in this case.
+ self._pkgindex = pkgindex = (bintree._populate_local() or
+ bintree._load_pkgindex())
cpv_all = self._bintree.dbapi.cpv_all()
cpv_all.sort()
- pkgindex = bintree._load_pkgindex()
- self._pkgindex = pkgindex
-
# Recount stale/missing packages, with lock held.
missing = []
stale = []