From 56533986566927a386e05ccddcd513857f6711ee Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 24 Aug 2012 13:24:51 -0400 Subject: fixed handling of SEModules with multiple specific modules --- src/lib/Bcfg2/Server/Plugins/SEModules.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/SEModules.py') diff --git a/src/lib/Bcfg2/Server/Plugins/SEModules.py b/src/lib/Bcfg2/Server/Plugins/SEModules.py index 0d75bb48f..62b3fb10a 100644 --- a/src/lib/Bcfg2/Server/Plugins/SEModules.py +++ b/src/lib/Bcfg2/Server/Plugins/SEModules.py @@ -15,7 +15,6 @@ class SEModules(Bcfg2.Server.Plugin.GroupSpool): """ Handle SELinux 'module' entries """ name = 'SEModules' __author__ = 'chris.a.st.pierre@gmail.com' - es_cls = Bcfg2.Server.Plugin.EntrySet es_child_cls = SEModuleData entry_type = 'SELinux' experimental = True @@ -41,5 +40,6 @@ class SEModules(Bcfg2.Server.Plugin.GroupSpool): return self.Entries[entry.tag][entry.get("name")](entry, metadata) def add_entry(self, event): - self.filename_pattern = os.path.basename(event.filename) + self.filename_pattern = \ + os.path.basename(os.path.dirname(self.event_path(event))) Bcfg2.Server.Plugin.GroupSpool.add_entry(self, event) -- cgit v1.2.3-1-g7c22