summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-07-05 20:44:53 +0000
committerZac Medico <zmedico@gentoo.org>2009-07-05 20:44:53 +0000
commit333c200ab3739e1c49700adb0fc2adc191907503 (patch)
treeac38f3aecb5060be741a2c55405f22b64fddcb7f
parent54b1f44ff3d2a6f5d63da37263443ada1bc67255 (diff)
downloadportage-333c200ab3739e1c49700adb0fc2adc191907503.tar.gz
portage-333c200ab3739e1c49700adb0fc2adc191907503.tar.bz2
portage-333c200ab3739e1c49700adb0fc2adc191907503.zip
Make sure avoid_update always returns existing_node if available.
svn path=/main/trunk/; revision=13789
-rw-r--r--pym/_emerge/depgraph.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 9d415c7e1..5bc4275fa 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2223,6 +2223,8 @@ class depgraph(object):
if len(matched_packages) > 1:
if avoid_update:
+ if existing_node is not None:
+ return existing_node, existing_node
for pkg in matched_packages:
if pkg.installed:
return pkg, existing_node