diff options
| author | Michael Fenn <fennm@deshawresearch.com> | 2013-03-29 10:31:07 -0400 |
|---|---|---|
| committer | Michael Fenn <fennm@deshawresearch.com> | 2013-03-29 10:32:10 -0400 |
| commit | 3de72bb8c3bb0f0e71357657a256fe33cb65c168 (patch) | |
| tree | 63d86229be67cde282a7fd64e4385a93ffdc28c1 /src/sbin/bcfg2-info | |
| parent | 84727ad72887808182e17db386158261c7ff14ad (diff) | |
| download | bcfg2-3de72bb8c3bb0f0e71357657a256fe33cb65c168.tar.gz bcfg2-3de72bb8c3bb0f0e71357657a256fe33cb65c168.tar.bz2 bcfg2-3de72bb8c3bb0f0e71357657a256fe33cb65c168.zip | |
Update bcfg2-info OptionParser to use client options
bcfg2-info uses CLI_COMMON_OPTIONS which is a subset of the
full CLIENT_COMMON_OPTIONS that the bcfg2 client uses. This causes
bcfg2-info to fail on the builddir comand with the following traceback
> builddir drdws0056.nyc.desres.deshaw.com /tmp/drdws0056
Command failure
Traceback (most recent call last):
File "/usr/sbin/bcfg2-info", line 157, in do_loop
self.cmdloop('Welcome to bcfg2-info\n'
File "/usr/lib64/python2.4/cmd.py", line 142, in cmdloop
stop = self.onecmd(line)
File "/usr/lib64/python2.4/cmd.py", line 219, in onecmd
return func(arg)
File "/usr/sbin/bcfg2-info", line 283, in do_builddir
client_config)
File "/usr/lib/python2.4/site-packages/Bcfg2/Client/Tools/POSIX/__init__.py", line 19, in __init__
self.ppath = setup['ppath']
KeyError: 'ppath'
ppath is included in CLIENT_COMMON_OPTIONS, but not CLI_COMMON_OPTIONS
so this commit changes bcfg2-info to parse the fuller
CLIENT_COMMON_OPTIONS.
Diffstat (limited to 'src/sbin/bcfg2-info')
| -rwxr-xr-x | src/sbin/bcfg2-info | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index cfcc95be2..b9aebe138 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -754,7 +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.CLIENT_COMMON_OPTIONS) optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS) setup = Bcfg2.Options.OptionParser(optinfo) setup.hm = "\n".join([" bcfg2-info [options] [command <command args>]", |