diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-03-31 21:08:10 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-03-31 21:08:10 +0000 |
commit | 1c9e38f9f01deef58aecfc619fd5605503f2f09a (patch) | |
tree | 68ae4bdd710f160dd01fdc3a666fa5c13c8210ba /bin | |
parent | 1a1465d12e4d26f853a456c0ac91e56e69e7c476 (diff) | |
download | portage-1c9e38f9f01deef58aecfc619fd5605503f2f09a.tar.gz portage-1c9e38f9f01deef58aecfc619fd5605503f2f09a.tar.bz2 portage-1c9e38f9f01deef58aecfc619fd5605503f2f09a.zip |
Fix package selection logic to always properly reject the installed package
when another is available and the user wants to reinstall. (trunk r9652)
svn path=/main/branches/2.1.2/; revision=9653
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/emerge | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index d912176b6..f9ea202a1 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2353,8 +2353,10 @@ class depgraph: cpv=cpv, metadata=metadata, built=built, installed=installed, onlydeps=onlydeps) - if installed and want_reinstall: - matched_packages.insert(0, pkg) + if installed and want_reinstall and matched_packages: + # Reject the installed package unless + # there are no other matches. + break else: matched_packages.append(pkg) if reinstall_for_flags: |