From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 5 Jul 2009 20:44:53 +0000 (-0000)
Subject: Make sure avoid_update always returns existing_node if available.
X-Git-Tag: v2.2_rc34~73
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=333c200ab3739e1c49700adb0fc2adc191907503;p=portage.git

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 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