From 68804df4b5ccc251c788a99b5682bb9aba973cb9 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 17 Jan 2013 12:53:20 -0500 Subject: read default Path metadata from config file properly --- src/lib/Bcfg2/Server/Plugin/helpers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Server/Plugin') 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__) -- cgit v1.2.3-1-g7c22