From e45ca2c053d03dd4cb1e33b1510c8f8f2b4716d1 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 15 Oct 2012 14:17:44 -0500 Subject: Plugins: Fix info/:info regex Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Server/Plugin/helpers.py | 8 ++++---- 1 file 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\S+)|' + 'group:(\s)*(?P\S+)|' + - 'perms:(\s)*(?P\w+)|' + + 'mode:(\s)*(?P\w+)|' + 'secontext:(\s)*(?P\S+)|' + 'paranoid:(\s)*(?P\S+)|' + 'sensitive:(\s)*(?P\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 -- cgit v1.2.3-1-g7c22