diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-31 14:21:31 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-31 14:24:13 -0400 |
| commit | 27fac3a9d466d19090ffc4ebe27b532641e30027 (patch) | |
| tree | a762ad41af80d34fa12db47449c7e405d502cae2 /src/lib/Bcfg2/Options | |
| parent | 30ef3035d3611ca508cfdc65bb90a565e187ee48 (diff) | |
| download | bcfg2-27fac3a9d466d19090ffc4ebe27b532641e30027.tar.gz bcfg2-27fac3a9d466d19090ffc4ebe27b532641e30027.tar.bz2 bcfg2-27fac3a9d466d19090ffc4ebe27b532641e30027.zip | |
Options: Don't reparse initial config file
It hasn't been parsed at this stage anyway.
Diffstat (limited to 'src/lib/Bcfg2/Options')
| -rw-r--r-- | src/lib/Bcfg2/Options/Parser.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Options/Parser.py b/src/lib/Bcfg2/Options/Parser.py index 9258d000b..a04399fa1 100644 --- a/src/lib/Bcfg2/Options/Parser.py +++ b/src/lib/Bcfg2/Options/Parser.py @@ -162,7 +162,7 @@ class Parser(argparse.ArgumentParser): attr not in self._config_files): delattr(self.namespace, attr) - def add_config_file(self, dest, cfile): + def add_config_file(self, dest, cfile, reparse=True): """ Add a config file, which triggers a full reparse of all options. """ if dest not in self._config_files: @@ -170,7 +170,8 @@ class Parser(argparse.ArgumentParser): self._cfp.read([cfile]) self._defaults_set = [] self._set_defaults() - self._parse_config_options() + if reparse: + self._parse_config_options() self._config_files.append(dest) def reparse(self, argv=None): @@ -207,7 +208,8 @@ class Parser(argparse.ArgumentParser): # check whether the specified bcfg2.conf exists if not os.path.exists(bootstrap.config): self.error("Could not read %s" % bootstrap.config) - self.add_config_file(self.configfile.dest, bootstrap.config) + self.add_config_file(self.configfile.dest, bootstrap.config, + reparse=False) # phase 2: re-parse command line for early options; currently, # that's database options |