diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 12:53:20 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 12:53:20 -0500 |
| commit | 68804df4b5ccc251c788a99b5682bb9aba973cb9 (patch) | |
| tree | 91e8930f7aad0333360d99ff1d5d60442d623ae7 /src | |
| parent | ae58c24f72a8ed72327fbc3f7305bd69ec6a13db (diff) | |
| download | bcfg2-68804df4b5ccc251c788a99b5682bb9aba973cb9.tar.gz bcfg2-68804df4b5ccc251c788a99b5682bb9aba973cb9.tar.bz2 bcfg2-68804df4b5ccc251c788a99b5682bb9aba973cb9.zip | |
read default Path metadata from config file properly
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin/helpers.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py index acf6af1f8..41c450b4e 100644 --- a/src/lib/Bcfg2/Server/Plugin/helpers.py +++ b/src/lib/Bcfg2/Server/Plugin/helpers.py @@ -25,6 +25,7 @@ except ImportError: #: A dict containing default metadata for Path entries from bcfg2.conf DEFAULT_FILE_METADATA = Bcfg2.Options.OptionParser(dict( + configfile=Bcfg2.Options.CFILE, owner=Bcfg2.Options.MDATA_OWNER, group=Bcfg2.Options.MDATA_GROUP, mode=Bcfg2.Options.MDATA_MODE, @@ -32,8 +33,9 @@ DEFAULT_FILE_METADATA = Bcfg2.Options.OptionParser(dict( important=Bcfg2.Options.MDATA_IMPORTANT, paranoid=Bcfg2.Options.MDATA_PARANOID, sensitive=Bcfg2.Options.MDATA_SENSITIVE)) -DEFAULT_FILE_METADATA.parse(sys.argv[1:]) +DEFAULT_FILE_METADATA.parse([Bcfg2.Options.CFILE.cmd, Bcfg2.Options.CFILE]) del DEFAULT_FILE_METADATA['args'] +del DEFAULT_FILE_METADATA['configfile'] LOGGER = logging.getLogger(__name__) |