diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2008-01-18 21:45:12 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2008-01-18 21:45:12 +0000 |
| commit | 6ec2e7a30c30d6a8cd96c9ffa4fc4d1f484596a5 (patch) | |
| tree | 22e560a84549abad1aa8943d79eb7cc22002cb14 | |
| parent | eaa1b0613155510a984a2c33da358de497c04375 (diff) | |
| download | bcfg2-6ec2e7a30c30d6a8cd96c9ffa4fc4d1f484596a5.tar.gz bcfg2-6ec2e7a30c30d6a8cd96c9ffa4fc4d1f484596a5.tar.bz2 bcfg2-6ec2e7a30c30d6a8cd96c9ffa4fc4d1f484596a5.zip | |
Finish fixing option parsing for bcfg2-repo-validate
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4265 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Options.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py index fc1f63a54..3bb7fe872 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -1,7 +1,7 @@ '''Option parsing library for utilities''' __revision__ = '$Revision$' -import getopt, os, socket, sys, ConfigParser +import getopt, os, socket, sys, ConfigParser, Bcfg2.Client.Tools def bool_cook(x): if x: @@ -157,7 +157,7 @@ SERVER_KEY = Option('Path to SSL key', cf=('communication', 'key'), SERVER_PASSWORD = Option('Communication Password', cmd='-x', odesc='<password>', cf=('communication', 'password'), default=False) INSTALL_PREFIX = Option('Installation location', cf=('server', 'prefix'), - default='/usr') + default='/usr', odesc='</path>') SERVER_PROTOCOL = Option('Server Protocol', cf=('communication', 'procotol'), default='xmlrpc/ssl') SENDMAIL_PATH = Option('Path to sendmail', cf=('reports', 'sendmailpath'), @@ -175,9 +175,10 @@ CLIENT_EXTRA_DISPLAY = Option('enable extra entry output', CLIENT_PARANOID = Option('make automatic backups of config files', default=False, cmd='-P', ) CLIENT_AGENT = Option('run in agent (continuous) mode, wait for reconfigure command from server', default=False, cmd='-A', ) -CLIENT_DRIVERS = Option('Specify tool driver set', default=False, - cmd='-D', cf=('client', 'drivers'), - odesc="<driver1,driver2>") +CLIENT_DRIVERS = Option('Specify tool driver set', cmd='-D', + cf=('client', 'drivers'), + odesc="<driver1,driver2>", cook=list_split, + default=','.join(Bcfg2.Client.Tools.default)) CLIENT_CACHE = Option('store the configuration in a file', default=False, cmd='-c', odesc="<cache path>") CLIENT_REMOVE = Option('force removal of additional configuration items', |