Make sure avoid_update always returns existing_node if available.

svn path=/main/trunk/; revision=13789

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 9d415c7e1930c06cefefacb932a5ecf8d1881216..5bc4275fa024e73f5965dc2b9197c4fa160ee05f 100644 (file)
--- 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