diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-05-24 16:21:47 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-05-24 16:21:47 -0500 |
| commit | 2b0af0ccf792dd2f0420fd8eaa6bc8be8a8671bf (patch) | |
| tree | 56d5d0933b98ee61f9b7efad15f91975910bdca7 /nova/flags.py | |
| parent | d3c6f77f287f8078606ca7fc99a8121cadb76fd4 (diff) | |
| parent | 781ed70a4035fe507e2e1e83dcd5262c81792b5a (diff) | |
| download | nova-2b0af0ccf792dd2f0420fd8eaa6bc8be8a8671bf.tar.gz nova-2b0af0ccf792dd2f0420fd8eaa6bc8be8a8671bf.tar.xz nova-2b0af0ccf792dd2f0420fd8eaa6bc8be8a8671bf.zip | |
merge trunk
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() |