From 1612229e09f321c36bd05643eaf14d695dc89c79 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 27 Mar 2008 04:23:30 +0000 Subject: [PATCH] Make --noreplace take precedence over --newuse, as suggested by wolf31o2. svn path=/main/trunk/; revision=9513 --- pym/_emerge/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) 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, -- 2.26.2