From b26d8ce8e72e3bf1c4466501d4e0f534059c6163 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 4 Oct 2012 15:29:48 -0400 Subject: fixed bcfg2-lint checking of bundle names with . in them --- src/lib/Bcfg2/Server/Plugins/Bundler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Server') diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py index 59e85f198..3bd6b7910 100644 --- a/src/lib/Bcfg2/Server/Plugins/Bundler.py +++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py @@ -189,7 +189,7 @@ class BundlerLint(Bcfg2.Server.Lint.ServerPlugin): # genshi template xdata = lxml.etree.parse(bundle.template.filepath).getroot() - fname = bundle.name.split('Bundler/')[1].split('.')[0] + fname = os.path.splitext(os.path.basename(bundle.name))[0] bname = xdata.get('name') if fname != bname: self.LintError("inconsistent-bundle-name", -- cgit v1.2.3-1-g7c22