diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-12-31 13:41:55 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-12-31 13:41:55 +0000 |
| commit | ef9079e5e09a77cacde3ef7f3449cb0f23f4cc3b (patch) | |
| tree | f23d0b575ff0f2a449c49acee79367d1744541ba | |
| parent | e5404471d08f1b3574caa4f172da78356079f8e6 (diff) | |
| download | bcfg2-ef9079e5e09a77cacde3ef7f3449cb0f23f4cc3b.tar.gz bcfg2-ef9079e5e09a77cacde3ef7f3449cb0f23f4cc3b.tar.bz2 bcfg2-ef9079e5e09a77cacde3ef7f3449cb0f23f4cc3b.zip | |
unify default config location settings
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4151 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Options.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py index b896644f3..21616d1e2 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -12,8 +12,10 @@ def bool_cook(x): class OptionFailure(Exception): pass +DEFAULT_CONFIG_LOCATION = '/etc/bcfg2.conf' + class Option(object): - cfpath = '/etc/bcfg2.conf' + cfpath = DEFAULT_CONFIG_LOCATION __cfp = False def getCFP(self): if not self.__cfp: @@ -124,7 +126,7 @@ class OptionSet(dict): list_split = lambda x:x.replace(' ','').split(',') -CFILE = Option('Specify configuration file', '/etc/bcfg2.conf', cmd='-C', +CFILE = Option('Specify configuration file', DEFAULT_CONFIG_LOCATION, cmd='-C', odesc='<conffile>') HELP = Option('Print this usage message', False, cmd='-h') DEBUG = Option("Enable debugging output", False, cmd='-d') |