diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-27 04:33:23 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-27 04:33:23 +0000 |
| commit | d622d5478c0cb651b5e561f0485ac9d4d200ef6c (patch) | |
| tree | cdf8ee2f906f365486fc55f1e2c0f167cf67ca09 /bin | |
| parent | 07f7ba64e55c52e14f8509fc519cb0648f5c6a55 (diff) | |
| download | portage-d622d5478c0cb651b5e561f0485ac9d4d200ef6c.tar.gz portage-d622d5478c0cb651b5e561f0485ac9d4d200ef6c.tar.bz2 portage-d622d5478c0cb651b5e561f0485ac9d4d200ef6c.zip | |
Make --noreplace take precedence over --newuse, as suggested by wolf31o2.
(trunk r9512:9514)
svn path=/main/branches/2.1.2/; revision=9515
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 3623ea2ea..2140a0275 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1635,6 +1635,7 @@ class depgraph: return 0 del e + noreplace = "--noreplace" in self.myopts reinstall_for_flags = None merging=1 if mytype == "installed": @@ -1648,7 +1649,7 @@ class depgraph: """ If we aren't merging, perform the --newuse check. If the package has new iuse flags or different use flags then if --newuse is specified, we need to merge the package. """ - if merging == 0 and \ + if not noreplace and merging == 0 and \ myroot == self.target_root and \ ("--newuse" in self.myopts or "--reinstall" in self.myopts) and \ |