From c36283f8b19447154f00d0f2248aa73f3241ef47 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 27 Mar 2008 04:41:17 +0000 Subject: [PATCH] Make --noreplace take precedence over --newuse, as suggested by wolf31o2. (trunk r9512:9514) svn path=/main/branches/2.1.2/; revision=9517 --- bin/emerge | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 \ -- 2.26.2