diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-10-15 14:17:44 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-10-15 14:17:44 -0500 |
| commit | e45ca2c053d03dd4cb1e33b1510c8f8f2b4716d1 (patch) | |
| tree | 9e5dfa347a74b6f99368bb074ecc1c968ab25276 /src | |
| parent | b2bc6bdeb491002d937342896294d0de8586084a (diff) | |
| download | bcfg2-e45ca2c053d03dd4cb1e33b1510c8f8f2b4716d1.tar.gz bcfg2-e45ca2c053d03dd4cb1e33b1510c8f8f2b4716d1.tar.bz2 bcfg2-e45ca2c053d03dd4cb1e33b1510c8f8f2b4716d1.zip | |
Plugins: Fix info/:info regex
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin/helpers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py index 131b572a4..04a26c86b 100644 --- a/src/lib/Bcfg2/Server/Plugin/helpers.py +++ b/src/lib/Bcfg2/Server/Plugin/helpers.py @@ -27,7 +27,7 @@ except ImportError: DEFAULT_FILE_METADATA = Bcfg2.Options.OptionParser(dict( owner=Bcfg2.Options.MDATA_OWNER, group=Bcfg2.Options.MDATA_GROUP, - perms=Bcfg2.Options.MDATA_PERMS, + mode=Bcfg2.Options.MDATA_PERMS, secontext=Bcfg2.Options.MDATA_SECONTEXT, important=Bcfg2.Options.MDATA_IMPORTANT, paranoid=Bcfg2.Options.MDATA_PARANOID, @@ -40,7 +40,7 @@ LOGGER = logging.getLogger(__name__) #: a compiled regular expression for parsing info and :info files INFO_REGEX = re.compile('owner:(\s)*(?P<owner>\S+)|' + 'group:(\s)*(?P<group>\S+)|' + - 'perms:(\s)*(?P<perms>\w+)|' + + 'mode:(\s)*(?P<mode>\w+)|' + 'secontext:(\s)*(?P<secontext>\S+)|' + 'paranoid:(\s)*(?P<paranoid>\S+)|' + 'sensitive:(\s)*(?P<sensitive>\S+)|' + @@ -1328,8 +1328,8 @@ class EntrySet(Debuggable): for key, value in list(mgd.items()): if value: self.metadata[key] = value - if len(self.metadata['perms']) == 3: - self.metadata['perms'] = "0%s" % self.metadata['perms'] + if len(self.metadata['mode']) == 3: + self.metadata['mode'] = "0%s" % self.metadata['mode'] def reset_metadata(self, event): """ Reset metadata to defaults if info. :info, or info.xml are |