Allow -C to remove packages referenced by sets in world_sets
authorSebastian Luther <SebastianLuther@gmx.de>
Fri, 30 Apr 2010 06:03:29 +0000 (08:03 +0200)
committerZac Medico <zmedico@gentoo.org>
Fri, 30 Apr 2010 06:08:10 +0000 (23:08 -0700)
pym/_emerge/unmerge.py

index bfd5576d28c6d748c28638c3703cb695ab00b971..87875018e71b019a7ec09ea2a994f06fab3c5cc2 100644 (file)
@@ -377,17 +377,10 @@ def unmerge(root_config, myopts, unmerge_action,
                                                        parents.append(s)
                                                        break
                        if parents:
-                               #print colorize("WARN", "Package %s is going to be unmerged," % cpv)
-                               #print colorize("WARN", "but still listed in the following package sets:")
-                               #print "    %s\n" % ", ".join(parents)
-                               print(colorize("WARN", "Not unmerging package %s as it is" % cpv))
-                               print(colorize("WARN", "still referenced by the following package sets:"))
+                               print(colorize("WARN", "Package %s is going to be unmerged," % cpv))
+                               print(colorize("WARN", "but still listed in the following package sets:"))
                                print("    %s\n" % ", ".join(parents))
-                               # adjust pkgmap so the display output is correct
-                               pkgmap[cp]["selected"].remove(cpv)
-                               all_selected.remove(cpv)
-                               pkgmap[cp]["protected"].add(cpv)
-       
+
        del installed_sets
 
        numselected = len(all_selected)