| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-10 08:48:15 +0000 (Sat, 10 May 2008) |
| 3 |
New Revision: 10282 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Always include satisfied blockers as an indicator that blocking |
| 9 |
packages will be temporarily installed simultaneously. (trunk r10281) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-10 08:47:45 UTC (rev 10281) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-10 08:48:15 UTC (rev 10282) |
| 16 |
@@ -4194,12 +4194,14 @@ |
| 17 |
|
| 18 |
retlist.append(node) |
| 19 |
|
| 20 |
- if isinstance(node, Package) and \ |
| 21 |
- "uninstall" == node.operation: |
| 22 |
- # Include satisfied blockers in the merge list so |
| 23 |
- # that the user can see why the package had to be |
| 24 |
- # uninstalled in advance rather than through |
| 25 |
- # replacement. |
| 26 |
+ if (isinstance(node, Package) and \ |
| 27 |
+ "uninstall" == node.operation) or \ |
| 28 |
+ (uninst_task is not None and \ |
| 29 |
+ uninst_task in scheduled_uninstalls): |
| 30 |
+ # Include satisfied blockers in the merge list |
| 31 |
+ # since the user might be interested and also |
| 32 |
+ # it serves as an indicator that blocking packages |
| 33 |
+ # will be temporarily installed simultaneously. |
| 34 |
for blocker in solved_blockers: |
| 35 |
retlist.append(Blocker(atom=blocker.atom, |
| 36 |
root=blocker.root, satisfied=True)) |
| 37 |
|
| 38 |
-- |
| 39 |
gentoo-commits@l.g.o mailing list |
Archives