summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/SEModules.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-14 15:55:28 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-14 15:55:28 -0400
commite22f8fd49026ab4d162b835fdf80609949039bcb (patch)
tree5c68a6a76e22492a4c6c70e99d15f1dd1f14d17a /src/lib/Bcfg2/Server/Plugins/SEModules.py
parent62cf189b1caf948cd01220edf59e991c7290e54e (diff)
downloadbcfg2-e22f8fd49026ab4d162b835fdf80609949039bcb.tar.gz
bcfg2-e22f8fd49026ab4d162b835fdf80609949039bcb.tar.bz2
bcfg2-e22f8fd49026ab4d162b835fdf80609949039bcb.zip
SEModules: fixed some bits of module handling
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/SEModules.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/SEModules.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/SEModules.py b/src/lib/Bcfg2/Server/Plugins/SEModules.py
index 8e1dd15f6..8093d34ca 100644
--- a/src/lib/Bcfg2/Server/Plugins/SEModules.py
+++ b/src/lib/Bcfg2/Server/Plugins/SEModules.py
@@ -5,6 +5,7 @@ from Bcfg2.Compat import b64encode
logger = logging.getLogger(__name__)
+
class SEModuleData(Bcfg2.Server.Plugin.SpecificData):
def bind_entry(self, entry, _):
entry.set('encoding', 'base64')
@@ -24,20 +25,19 @@ class SEModules(Bcfg2.Server.Plugin.GroupSpool):
to be able to specify module entries as name='foo' or
name='foo.pp', so we put this abstraction in between """
if entry.get("name").endswith(".pp"):
- name = entry.get("name")
+ return entry.get("name")
else:
- name = entry.get("name") + ".pp"
- return "/" + name
+ return entry.get("name") + ".pp"
def HandlesEntry(self, entry, metadata):
if entry.tag in self.Entries and entry.get('type') == 'module':
- return self._get_module_name(entry) in self.Entries[entry.tag]
+ return "/" + self._get_module_name(entry) in self.Entries[entry.tag]
return Bcfg2.Server.Plugin.GroupSpool.HandlesEntry(self, entry,
metadata)
def HandleEntry(self, entry, metadata):
entry.set("name", self._get_module_name(entry))
- return self.Entries[entry.tag][entry.get("name")](entry, metadata)
+ return self.Entries[entry.tag]["/" + entry.get("name")](entry, metadata)
def add_entry(self, event):
self.filename_pattern = \