diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-27 04:23:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-27 04:23:30 +0000 |
| commit | 1612229e09f321c36bd05643eaf14d695dc89c79 (patch) | |
| tree | 546c08182e8b64c51ead1ee133ac229a84a158f6 /pym/_emerge | |
| parent | 49773c65c51326e757719f837a49ade14797f0d8 (diff) | |
| download | portage-1612229e09f321c36bd05643eaf14d695dc89c79.tar.gz portage-1612229e09f321c36bd05643eaf14d695dc89c79.tar.bz2 portage-1612229e09f321c36bd05643eaf14d695dc89c79.zip | |
Make --noreplace take precedence over --newuse, as suggested by wolf31o2.
svn path=/main/trunk/; revision=9513
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
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, |