From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 27 Mar 2008 04:23:30 +0000 (-0000)
Subject: Make --noreplace take precedence over --newuse, as suggested by wolf31o2.
X-Git-Tag: v2.2_pre6~328
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1612229e09f321c36bd05643eaf14d695dc89c79;p=portage.git

Make --noreplace take precedence over --newuse, as suggested by wolf31o2.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e6dedb960..bd5c22ac0 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2574,6 +2574,7 @@ class depgraph(object):
 		usepkgonly = "--usepkgonly" in self.myopts
 		empty = "empty" in self.myparams
 		selective = "selective" in self.myparams
+		noreplace = "--noreplace" in self.myopts
 		reinstall = False
 		# Behavior of the "selective" parameter depends on
 		# whether or not a package matches an argument atom.
@@ -2608,6 +2609,10 @@ class depgraph(object):
 				# descending order
 				cpv_list.reverse()
 				for cpv in cpv_list:
+					# Make --noreplace take precedence over --newuse.
+					if not installed and noreplace and \
+						cpv in vardb.match(atom):
+						continue
 					reinstall_for_flags = None
 					try:
 						metadata = dict(izip(db_keys,