aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-02-28 03:05:44 +0000
committerZac Medico <zmedico@gentoo.org>2010-02-28 03:05:44 +0000
commit84ca6b64a0244720e8fe9986ef6f92d668be35f1 (patch)
treea178384279b40944deb3ecff122dd49be547cfee /pym/portage/_global_updates.py
parentAdd a --quiet-unmerge-warn option to disable the warning message that's shown (diff)
downloadportage-84ca6b64a0244720e8fe9986ef6f92d668be35f1.tar.gz
portage-84ca6b64a0244720e8fe9986ef6f92d668be35f1.tar.bz2
portage-84ca6b64a0244720e8fe9986ef6f92d668be35f1.zip
Make _global_updates ensure that the binarytree is only populated with local
packages (getbinpkgs=0), and fix binarytree.populate() to behave properly when called more than once. svn path=/main/trunk/; revision=15487
Diffstat (limited to 'pym/portage/_global_updates.py')
-rw-r--r--pym/portage/_global_updates.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage/_global_updates.py b/pym/portage/_global_updates.py
index baf2e9b72..040de276a 100644
--- a/pym/portage/_global_updates.py
+++ b/pym/portage/_global_updates.py
@@ -94,6 +94,10 @@ def _global_updates(trees, prev_mtimes):
bindb = trees["/"]["bintree"].dbapi
if not os.access(bindb.bintree.pkgdir, os.W_OK):
bindb = None
+ else:
+ # Call binarytree.populate(), since we want to make sure it's
+ # only populated with local packages here (getbinpkgs=0).
+ bindb.bintree.populate()
for update_cmd in myupd:
if update_cmd[0] == "move":
moves = vardb.move_ent(update_cmd)