| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-27 04:41:17 +0000 (Thu, 27 Mar 2008) |
| 3 |
New Revision: 9517 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Make --noreplace take precedence over --newuse, as suggested by wolf31o2. |
| 9 |
(trunk r9512:9514) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-03-27 04:35:36 UTC (rev 9516) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-03-27 04:41:17 UTC (rev 9517) |
| 16 |
@@ -1635,6 +1635,7 @@ |
| 17 |
return 0 |
| 18 |
del e |
| 19 |
|
| 20 |
+ noreplace = "--noreplace" in self.myopts |
| 21 |
reinstall_for_flags = None |
| 22 |
merging=1 |
| 23 |
if mytype == "installed": |
| 24 |
@@ -1648,7 +1649,7 @@ |
| 25 |
""" If we aren't merging, perform the --newuse check. |
| 26 |
If the package has new iuse flags or different use flags then if |
| 27 |
--newuse is specified, we need to merge the package. """ |
| 28 |
- if merging == 0 and \ |
| 29 |
+ if not noreplace and merging == 0 and \ |
| 30 |
myroot == self.target_root and \ |
| 31 |
("--newuse" in self.myopts or |
| 32 |
"--reinstall" in self.myopts) and \ |
| 33 |
|
| 34 |
-- |
| 35 |
gentoo-commits@l.g.o mailing list |
Archives