| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-31 21:08:10 +0000 (Mon, 31 Mar 2008) |
| 3 |
New Revision: 9653 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Fix package selection logic to always properly reject the installed package |
| 9 |
when another is available and the user wants to reinstall. (trunk r9652) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-03-31 21:07:29 UTC (rev 9652) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-03-31 21:08:10 UTC (rev 9653) |
| 16 |
@@ -2353,8 +2353,10 @@ |
| 17 |
cpv=cpv, metadata=metadata, |
| 18 |
built=built, installed=installed, |
| 19 |
onlydeps=onlydeps) |
| 20 |
- if installed and want_reinstall: |
| 21 |
- matched_packages.insert(0, pkg) |
| 22 |
+ if installed and want_reinstall and matched_packages: |
| 23 |
+ # Reject the installed package unless |
| 24 |
+ # there are no other matches. |
| 25 |
+ break |
| 26 |
else: |
| 27 |
matched_packages.append(pkg) |
| 28 |
if reinstall_for_flags: |
| 29 |
|
| 30 |
-- |
| 31 |
gentoo-commits@l.g.o mailing list |
Archives