diff options
| author | Michael Fenn <fennm@deshawresearch.com> | 2013-03-29 11:09:50 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-01 07:34:37 -0400 |
| commit | bef04ca6ed60f51f04756df5a063379c0089321d (patch) | |
| tree | 93c4b13b9cb19e5efe5c1c617a6f5557051665f9 /src/sbin | |
| parent | 748a6c81e4233d7b4c75d9a529be26ada4306c5b (diff) | |
| download | bcfg2-bef04ca6ed60f51f04756df5a063379c0089321d.tar.gz bcfg2-bef04ca6ed60f51f04756df5a063379c0089321d.tar.bz2 bcfg2-bef04ca6ed60f51f04756df5a063379c0089321d.zip | |
Promote bcfg2-info to have it's own Options dict
Turns out that CLIENT_COMMON_OPTIONS and SERVER_COMMON_OPTIONS
conflict. Adding ppath and max_copies (turns out the latter is also
necessary) to the bcfg2-info code directly seemed like a maintenance
problem waiting to happen, so I factored that out into a new
INFO_COMMON_OPTIONS dict. That will keep any options parsing special
cases out of the bcfg2-info code hopefully be more maintainable
going forward.
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-info | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 462d41398..eac6ba71d 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -753,8 +753,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:", |