diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-01 04:16:07 -0700 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-01 04:16:07 -0700 |
| commit | b950aaa6f3452b2b5a14f6f01331f94e66ee3313 (patch) | |
| tree | 80b3a951a363f949389046c0c96c32d2984d3ca1 /src | |
| parent | 84727ad72887808182e17db386158261c7ff14ad (diff) | |
| parent | 773d9aaffe82a24146d8b26bf9e8e122c0ec5768 (diff) | |
| download | bcfg2-b950aaa6f3452b2b5a14f6f01331f94e66ee3313.tar.gz bcfg2-b950aaa6f3452b2b5a14f6f01331f94e66ee3313.tar.bz2 bcfg2-b950aaa6f3452b2b5a14f6f01331f94e66ee3313.zip | |
Merge pull request #67 from fennm/bcfg2-info-client-options
Update bcfg2-info OptionParser to use client options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Options.py | 4 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-info | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py index 7c91ca3cc..3197d2682 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -1269,6 +1269,10 @@ TEST_COMMON_OPTIONS = dict(noseopts=TEST_NOSEOPTS, xunit=TEST_XUNIT, validate=CFG_VALIDATION) +INFO_COMMON_OPTIONS = dict(ppath=PARANOID_PATH, + max_copies=PARANOID_MAX_COPIES) +INFO_COMMON_OPTIONS.update(CLI_COMMON_OPTIONS) +INFO_COMMON_OPTIONS.update(SERVER_COMMON_OPTIONS) class OptionParser(OptionSet): """ diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index cfcc95be2..391902e44 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -754,8 +754,7 @@ def main(): optinfo = dict(profile=Bcfg2.Options.CORE_PROFILE, interactive=Bcfg2.Options.INTERACTIVE, interpreter=Bcfg2.Options.INTERPRETER) - optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS) - optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS) + optinfo.update(Bcfg2.Options.INFO_COMMON_OPTIONS) setup = Bcfg2.Options.OptionParser(optinfo) setup.hm = "\n".join([" bcfg2-info [options] [command <command args>]", "Options:", |