diff options
author | Jason Kincl <kincljc@ornl.gov> | 2012-12-04 08:14:33 -0500 |
---|---|---|
committer | Jason Kincl <kincljc@ornl.gov> | 2012-12-04 08:14:33 -0500 |
commit | 09a45d745269a419b0c5da0664912e061dc8e5d3 (patch) | |
tree | c5c0af33093087f10f0caf5ce021aa4cb0b4a879 /src/lib/Bcfg2/Server/Plugins/SEModules.py | |
parent | 648c8f6e313e684d5fadc1fdbc97e08d83eb2b16 (diff) | |
parent | f35c38e87eafffb497338b9273fe84f284a41dcf (diff) | |
download | bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.tar.gz bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.tar.bz2 bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.zip |
Merge remote branch 'upstream/master' into jasons-hacking
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/SEModules.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SEModules.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/SEModules.py b/src/lib/Bcfg2/Server/Plugins/SEModules.py index 3edfb72a3..fa47f9496 100644 --- a/src/lib/Bcfg2/Server/Plugins/SEModules.py +++ b/src/lib/Bcfg2/Server/Plugins/SEModules.py @@ -40,8 +40,8 @@ class SEModules(Bcfg2.Server.Plugin.GroupSpool): #: objects as its EntrySet children. es_child_cls = SEModuleData - #: SEModules manages ``SELinux`` entries - entry_type = 'SELinux' + #: SEModules manages ``SEModule`` entries + entry_type = 'SEModule' #: The SEModules plugin is experimental experimental = True @@ -68,7 +68,7 @@ class SEModules(Bcfg2.Server.Plugin.GroupSpool): return name.lstrip("/") def HandlesEntry(self, entry, metadata): - if entry.tag in self.Entries and entry.get('type') == 'module': + if entry.tag in self.Entries: return self._get_module_filename(entry) in self.Entries[entry.tag] return Bcfg2.Server.Plugin.GroupSpool.HandlesEntry(self, entry, metadata) |