From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 30 Jun 2009 21:46:22 +0000 (-0000)
Subject: Tweak depgraph._select_pkg_highest_available_imp to avoid more updates when
X-Git-Tag: v2.2_rc34~115
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8c96a0c6b90265aed57f422342ab86ef456dcb3;p=portage.git

Tweak depgraph._select_pkg_highest_available_imp to avoid more updates when
in --avoid-update, by ignoring masked installed packages and packages for
which the ebuild is no longer available.

svn path=/main/trunk/; revision=13746
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index de097c419..a69ee323d 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1882,6 +1882,7 @@ class depgraph(object):
 		selective = "selective" in self.myparams
 		reinstall = False
 		noreplace = "--noreplace" in self.myopts
+		avoid_update = "--avoid-update" in self.myopts
 		# Behavior of the "selective" parameter depends on
 		# whether or not a package matches an argument atom.
 		# If an installed package provides an old-style
@@ -1918,7 +1919,9 @@ class depgraph(object):
 						continue
 					reinstall_for_flags = None
 
-					if not installed or (built and matched_packages):
+					if not pkg.installed or \
+						(pkg.built and matched_packages and \
+						not (avoid_update and pkg.installed)):
 						# Only enforce visibility on installed packages
 						# if there is at least one other visible package
 						# available. By filtering installed masked packages
@@ -2091,7 +2094,7 @@ class depgraph(object):
 				break
 
 		if len(matched_packages) > 1:
-			if "--avoid-update" in self.myopts:
+			if avoid_update:
 				for pkg in matched_packages:
 					if pkg.installed:
 						return pkg, existing_node