diff options
| author | termie <github@anarkystic.com> | 2011-05-24 20:40:59 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-05-24 20:40:59 +0000 |
| commit | 781ed70a4035fe507e2e1e83dcd5262c81792b5a (patch) | |
| tree | cfb01a9b4135caee416f8a031e5742b2b789d2f3 /nova/flags.py | |
| parent | 16ad120a23552f962a6f68f8cab7aca45a430c48 (diff) | |
| parent | 6be49381fc1c232e99de3e9774fb6c3e5b685fcf (diff) | |
| download | nova-781ed70a4035fe507e2e1e83dcd5262c81792b5a.tar.gz nova-781ed70a4035fe507e2e1e83dcd5262c81792b5a.tar.xz nova-781ed70a4035fe507e2e1e83dcd5262c81792b5a.zip | |
Fixes a bug related to incorrect reparsing of flags and prevents many extra reparses.
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/flags.py b/nova/flags.py index 32cb6efa8..9eaac5596 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -110,7 +110,7 @@ class FlagValues(gflags.FlagValues): return name in self.__dict__['__dirty'] def ClearDirty(self): - self.__dict__['__is_dirty'] = [] + self.__dict__['__dirty'] = [] def WasAlreadyParsed(self): return self.__dict__['__was_already_parsed'] @@ -119,11 +119,12 @@ class FlagValues(gflags.FlagValues): if '__stored_argv' not in self.__dict__: return new_flags = FlagValues(self) - for k in self.__dict__['__dirty']: + for k in self.FlagDict().iterkeys(): new_flags[k] = gflags.FlagValues.__getitem__(self, k) + new_flags.Reset() new_flags(self.__dict__['__stored_argv']) - for k in self.__dict__['__dirty']: + for k in new_flags.FlagDict().iterkeys(): setattr(self, k, getattr(new_flags, k)) self.ClearDirty() |