| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-27 04:23:30 +0000 (Thu, 27 Mar 2008) |
| 3 |
New Revision: 9513 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Make --noreplace take precedence over --newuse, as suggested by wolf31o2. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-03-26 23:37:58 UTC (rev 9512) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-03-27 04:23:30 UTC (rev 9513) |
| 15 |
@@ -2574,6 +2574,7 @@ |
| 16 |
usepkgonly = "--usepkgonly" in self.myopts |
| 17 |
empty = "empty" in self.myparams |
| 18 |
selective = "selective" in self.myparams |
| 19 |
+ noreplace = "--noreplace" in self.myopts |
| 20 |
reinstall = False |
| 21 |
# Behavior of the "selective" parameter depends on |
| 22 |
# whether or not a package matches an argument atom. |
| 23 |
@@ -2608,6 +2609,10 @@ |
| 24 |
# descending order |
| 25 |
cpv_list.reverse() |
| 26 |
for cpv in cpv_list: |
| 27 |
+ # Make --noreplace take precedence over --newuse. |
| 28 |
+ if not installed and noreplace and \ |
| 29 |
+ cpv in vardb.match(atom): |
| 30 |
+ continue |
| 31 |
reinstall_for_flags = None |
| 32 |
try: |
| 33 |
metadata = dict(izip(db_keys, |
| 34 |
|
| 35 |
-- |
| 36 |
gentoo-commits@l.g.o mailing list |
Archives