| 1 |
Author: zmedico |
| 2 |
Date: 2009-10-31 22:37:19 +0000 (Sat, 31 Oct 2009) |
| 3 |
New Revision: 14761 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/unmerge.py |
| 7 |
Log: |
| 8 |
Allow unmerge of packages from the "selected" set when a package set such |
| 9 |
as @unavailable is given on the command line. Thanks to Vlastimil Babka |
| 10 |
<caster@g.o> for reporting. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/unmerge.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/unmerge.py 2009-10-31 20:53:43 UTC (rev 14760) |
| 16 |
+++ main/trunk/pym/_emerge/unmerge.py 2009-10-31 22:37:19 UTC (rev 14761) |
| 17 |
@@ -332,10 +332,9 @@ |
| 18 |
parents = [] |
| 19 |
for s in installed_sets: |
| 20 |
# skip sets that the user requested to unmerge, and skip world |
| 21 |
- # unless we're unmerging a package set (as the package would be |
| 22 |
- # removed from "world" later on) |
| 23 |
- if s in root_config.setconfig.active or \ |
| 24 |
- (s == "selected" and not root_config.setconfig.active): |
| 25 |
+ # user-selected set, since the package will be removed from |
| 26 |
+ # that set later on. |
| 27 |
+ if s in root_config.setconfig.active or s == "selected": |
| 28 |
continue |
| 29 |
|
| 30 |
if s not in sets: |
Archives