diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-09 11:29:56 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-09 11:52:20 -0400 |
| commit | faa5a73f5eea8622696a898c691cd5cade63e492 (patch) | |
| tree | 009d6a9889e3046a475af0a2ac51911a72198c28 | |
| parent | 17d634011069564435df21d6bc1cd415f6e9f3e0 (diff) | |
| download | bcfg2-faa5a73f5eea8622696a898c691cd5cade63e492.tar.gz bcfg2-faa5a73f5eea8622696a898c691cd5cade63e492.tar.bz2 bcfg2-faa5a73f5eea8622696a898c691cd5cade63e492.zip | |
simplify default metadata loading
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py index cc2fb96ba..5c8913ef6 100644 --- a/src/lib/Bcfg2/Server/Plugin.py +++ b/src/lib/Bcfg2/Server/Plugin.py @@ -31,14 +31,12 @@ opts = {'owner': Bcfg2.Options.MDATA_OWNER, 'important': Bcfg2.Options.MDATA_IMPORTANT, 'paranoid': Bcfg2.Options.MDATA_PARANOID, 'sensitive': Bcfg2.Options.MDATA_SENSITIVE} -mdata_setup = Bcfg2.Options.OptionParser(opts) -mdata_setup.parse([]) -del mdata_setup['args'] +default_file_metadata = Bcfg2.Options.OptionParser(opts) +default_file_metadata.parse([]) +del default_file_metadata['args'] logger = logging.getLogger('Bcfg2.Server.Plugin') -default_file_metadata = mdata_setup - info_regex = re.compile( \ 'encoding:(\s)*(?P<encoding>\w+)|' + 'group:(\s)*(?P<group>\S+)|' + |