this fixes the weird behavior where unselecting a package wouldn't unselect it.

between looking at cvs logs and doing some testing with it, the condition that
this was originally working around looks to be fixed (if you had an optional
package somewhere that was mandatory somewhere else the state would get
screwed up).

the UI is still slightly non-intuitive since we don't tell you that it's
still going to be installed (aside from a log message), but if we pop them
up for everything, then we end up like dselect which isn't right either.

1 files changed, 2 insertions, 5 deletions

diff --git a/comps.py b/comps.py
index e473ed0f6..a9ed09aaf 100644
--- a/comps.py
+++ b/comps.py
@@ -377,11 +377,6 @@ class Component:
             if p not in self.newpkgDict.keys():
                 log("%s not in pkgDict for component %s" % (p.name, self.name))
             else:
-                # dont ref count more than once
-                if p in self.pkgDict.keys():
-                    log("%s already enabled in pkgDict for component %s" % (p.name, self.name))
-                    return
-
                 self.newpkgDict[p] = (PKGTYPE_OPTIONAL, 1)
                 p.registerComponent(self)
                 self.pkgDict[p] = None
@@ -415,6 +410,8 @@ class Component:
                     self.depsDict[p.name] = self.depsDict[p.name] - 1
                     if self.depsDict[p.name] == 0:
                         del self.depsDict[p.name]
+                    else:
+                        log("%s is required elsewhere (either as a dependency or for a group), remaining installed to satisfy" %(p.name,))
                 self.updateDependencyCountForRemoval(p)
         elif isinstance(p, Component):
             p.unselect(forInclude = 1, toplevel = 0)