equal
deleted
inserted
replaced
412 toremove = self.config.expand_cubes([cube]) |
412 toremove = self.config.expand_cubes([cube]) |
413 else: |
413 else: |
414 toremove = (cube,) |
414 toremove = (cube,) |
415 origcubes = self.config._cubes |
415 origcubes = self.config._cubes |
416 basecubes = [c for c in origcubes if not c in toremove] |
416 basecubes = [c for c in origcubes if not c in toremove] |
417 self.config._cubes = tuple(self.config.expand_cubes(basecubes)) |
417 # don't fake-add any new ones, or we won't be able to really-add them later |
|
418 self.config._cubes = tuple(cube for cube in self.config.expand_cubes(basecubes) |
|
419 if cube in origcubes) |
418 removed = [p for p in origcubes if not p in self.config._cubes] |
420 removed = [p for p in origcubes if not p in self.config._cubes] |
419 if not cube in removed and cube in origcubes: |
421 if not cube in removed and cube in origcubes: |
420 raise ConfigurationError("can't remove cube %s, " |
422 raise ConfigurationError("can't remove cube %s, " |
421 "used as a dependency" % cube) |
423 "used as a dependency" % cube) |
422 return removed |
424 return removed |