diff options
| author | Michael Fenn <fennm@deshawresearch.com> | 2014-04-14 10:12:24 -0400 |
|---|---|---|
| committer | Michael Fenn <fennm@deshawresearch.com> | 2014-04-14 10:12:24 -0400 |
| commit | de3f42ddf354d664195f1d0d3ddc8a77aa19dfdc (patch) | |
| tree | 42b268fa4cb83b52127bc27511e6b4c137093319 | |
| parent | 88b6227c495061b536097cac31ea98dada7d25ca (diff) | |
| download | bcfg2-de3f42ddf354d664195f1d0d3ddc8a77aa19dfdc.tar.gz bcfg2-de3f42ddf354d664195f1d0d3ddc8a77aa19dfdc.tar.bz2 bcfg2-de3f42ddf354d664195f1d0d3ddc8a77aa19dfdc.zip | |
don't trigger full reparse on adding config file
The full reparse turns out to be unnecessary with one change to
the server options, and plays havoc with ordering of django components
and overriding values in bcfg2-web.conf
| -rw-r--r-- | src/lib/Bcfg2/Options/Actions.py | 2 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-server | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Options/Actions.py b/src/lib/Bcfg2/Options/Actions.py index 0d65c584d..8b941f2bb 100644 --- a/src/lib/Bcfg2/Options/Actions.py +++ b/src/lib/Bcfg2/Options/Actions.py @@ -168,7 +168,7 @@ class ConfigFileAction(FinalizableAction): ``bcfg2-lint.conf``). """ def __call__(self, parser, namespace, values, option_string=None): - get_parser().add_config_file(self.dest, values) + parser.add_config_file(self.dest, values, reparse=False) FinalizableAction.__call__(self, parser, namespace, values, option_string=option_string) diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 274bd3659..00b4e92e3 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -16,6 +16,7 @@ class BackendAction(Bcfg2.Options.ComponentAction): class CLI(object): """ bcfg2-server CLI class """ + parse_first = True options = [ Bcfg2.Options.Option( cf=('server', 'backend'), help='Server Backend', |