diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-27 04:35:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-27 04:35:36 +0000 |
| commit | 2843c55bc39b0b8ce2ec317f54776a639162726d (patch) | |
| tree | 89c4fda8bc5ca70c37b1957e51c0db297d1f5793 /bin | |
| parent | d622d5478c0cb651b5e561f0485ac9d4d200ef6c (diff) | |
| download | portage-2843c55bc39b0b8ce2ec317f54776a639162726d.tar.gz portage-2843c55bc39b0b8ce2ec317f54776a639162726d.tar.bz2 portage-2843c55bc39b0b8ce2ec317f54776a639162726d.zip | |
revert previous commit since it had portage_locks stuff mixed in
svn path=/main/branches/2.1.2/; revision=9516
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 1 insertions, 2 deletions
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 \ |