From 2843c55bc39b0b8ce2ec317f54776a639162726d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 27 Mar 2008 04:35:36 +0000 Subject: revert previous commit since it had portage_locks stuff mixed in svn path=/main/branches/2.1.2/; revision=9516 --- bin/emerge | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 2140a0275..3623ea2ea 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1635,7 +1635,6 @@ class depgraph: return 0 del e - noreplace = "--noreplace" in self.myopts reinstall_for_flags = None merging=1 if mytype == "installed": @@ -1649,7 +1648,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 not noreplace and merging == 0 and \ + if merging == 0 and \ myroot == self.target_root and \ ("--newuse" in self.myopts or "--reinstall" in self.myopts) and \ -- cgit v1.2.3-1-g7c22