diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-06-25 14:36:33 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-06-25 14:36:33 -0400 |
| commit | 94788714a2867ebc2fcc5b80ba8a0939dcb9aa48 (patch) | |
| tree | 33517e12a58c85aac619a81a89b240927321c702 /src/lib/Bcfg2/Server/Plugins/Bundler.py | |
| parent | e93478e013d1cda7f77771f622f5c99ac0199979 (diff) | |
| download | bcfg2-94788714a2867ebc2fcc5b80ba8a0939dcb9aa48.tar.gz bcfg2-94788714a2867ebc2fcc5b80ba8a0939dcb9aa48.tar.bz2 bcfg2-94788714a2867ebc2fcc5b80ba8a0939dcb9aa48.zip | |
unified [Single]XMLFileBacked, enabled xinclude pretty much everywhere
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Bundler.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Bundler.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py index 6289439c6..a7b5dccde 100644 --- a/src/lib/Bcfg2/Server/Plugins/Bundler.py +++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py @@ -19,7 +19,6 @@ except: class BundleFile(Bcfg2.Server.Plugin.StructFile): - def get_xml_value(self, metadata): bundlename = os.path.splitext(os.path.basename(self.name))[0] bundle = lxml.etree.Element('Bundle', name=bundlename) @@ -50,7 +49,7 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, self.logger.error("Failed to load Bundle repository") raise Bcfg2.Server.Plugin.PluginInitError - def template_dispatch(self, name): + def template_dispatch(self, name, _): bundle = lxml.etree.parse(name, parser=Bcfg2.Server.XMLParser) nsmap = bundle.getroot().nsmap @@ -63,7 +62,7 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, else: raise Bcfg2.Server.Plugin.PluginExecutionError("Genshi not available: %s" % name) else: - return BundleFile(name) + return BundleFile(name, self.fam) def BuildStructures(self, metadata): """Build all structures for client (metadata).""" |