# HG changeset patch # User Julien Cristau # Date 1323091901 -3600 # Node ID e5858a4a124457c97df92271aaf71a2262c48d08 # Parent 241123f7bcd07fdbfcc9efe161398306cf96c275 [migration] make remove_cube('foo') not fail if foo is already removed. Closes #2106532 diff -r 241123f7bcd0 -r e5858a4a1244 migration.py --- a/migration.py Mon Dec 05 13:42:23 2011 +0100 +++ b/migration.py Mon Dec 05 14:31:41 2011 +0100 @@ -411,7 +411,7 @@ basecubes = [c for c in origcubes if not c in toremove] self.config._cubes = tuple(self.config.expand_cubes(basecubes)) removed = [p for p in origcubes if not p in self.config._cubes] - if not cube in removed: + if not cube in removed and cube in origcubes: raise ConfigurationError("can't remove cube %s, " "used as a dependency" % cube) return removed