Parcourir la source

Merged in aznashwan/coriolis/osmorphing_get_packages (pull request #42)

Fixed BaseLinuxOSMorphingTools.get_packages to allow for package removal from export morphing tools.
Nashwan Azhari il y a 9 ans
Parent
commit
b7abbb83aa
1 fichiers modifiés avec 4 ajouts et 4 suppressions
  1. 4 4
      coriolis/osmorphing/base.py

+ 4 - 4
coriolis/osmorphing/base.py

@@ -78,12 +78,12 @@ class BaseLinuxOSMorphingTools(BaseOSMorphingTools):
                  h is None or h == self._hypervisor]
                  h is None or h == self._hypervisor]
 
 
         add = [p[0] for p in itertools.chain.from_iterable(
         add = [p[0] for p in itertools.chain.from_iterable(
-               [l for k, l in self._packages.items() if k in k_add])]
+               [l for k, l in self._packages.items() if k in k_add])
+               if p[1]]
 
 
-        k_remove = set(self._packages.keys()) - set(k_add)
         remove = [p[0] for p in itertools.chain.from_iterable(
         remove = [p[0] for p in itertools.chain.from_iterable(
-                  [l for k, l in self._packages.items() if k in k_remove])
-                  if p[1]]
+                  [l for k, l in self._packages.items()])
+                  if not p[1]]
 
 
         return add, remove
         return add, remove