diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-12-17 13:07:43 +0100 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-12-17 13:07:43 +0100 |
| commit | 2be7a90e546447ea66580f50c289e6ff87ee9487 (patch) | |
| tree | 35aa7363132067cc1f69817b364fc69d35ac6e5d /nova/flags.py | |
| parent | e84f46e739c56b7ae186866f33c713a0ac98e770 (diff) | |
| parent | cd460a1f661eea7e050891f50a8218fdf24f2c6f (diff) | |
| download | nova-2be7a90e546447ea66580f50c289e6ff87ee9487.tar.gz nova-2be7a90e546447ea66580f50c289e6ff87ee9487.tar.xz nova-2be7a90e546447ea66580f50c289e6ff87ee9487.zip | |
Merge trunk (naïvely).
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py index 5c265f4ea..8fa0beb7a 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -159,6 +159,7 @@ class StrWrapper(object): return str(val) raise KeyError(name) + FLAGS = FlagValues() gflags.FLAGS = FLAGS gflags.DEFINE_flag(gflags.HelpFlag(), FLAGS) @@ -183,6 +184,12 @@ DEFINE_list = _wrapper(gflags.DEFINE_list) DEFINE_spaceseplist = _wrapper(gflags.DEFINE_spaceseplist) DEFINE_multistring = _wrapper(gflags.DEFINE_multistring) DEFINE_multi_int = _wrapper(gflags.DEFINE_multi_int) +DEFINE_flag = _wrapper(gflags.DEFINE_flag) + + +HelpFlag = gflags.HelpFlag +HelpshortFlag = gflags.HelpshortFlag +HelpXMLFlag = gflags.HelpXMLFlag def DECLARE(name, module_string, flag_values=FLAGS): |