summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2014-11-25 17:56:16 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2014-11-25 17:57:04 +0100
commitd4ae5e04739d9a8e0732dd35ee28c14b0ff96957 (patch)
treeef161f9a56426122f547794010ef34ae40b4a2cd /src
parent84b180e2fddcb5563adca33ed6feb3fd991dfde2 (diff)
downloadbcfg2-d4ae5e04739d9a8e0732dd35ee28c14b0ff96957.tar.gz
bcfg2-d4ae5e04739d9a8e0732dd35ee28c14b0ff96957.tar.bz2
bcfg2-d4ae5e04739d9a8e0732dd35ee28c14b0ff96957.zip
Bundler: modification is now the boolean inherit_modification
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Bundler.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py
index 4945bf85b..6c35ada59 100644
--- a/src/lib/Bcfg2/Server/Plugins/Bundler.py
+++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py
@@ -130,15 +130,16 @@ class Bundler(Plugin,
if child.get("name") not in bundles_added:
bundles.append(child.get("name"))
bundles_added.add(child.get("name"))
- if child.get('modification', 'ignore') == 'inherit':
+ if child.get('inherit_modification', 'false') == 'true':
if metadata.version_info >= \
Bcfg2VersionInfo('1.4.0pre2'):
lxml.etree.SubElement(data, 'Bundle',
name=child.get('name'))
else:
self.logger.warning(
- 'Bundler: modification="inherit" is only '
- 'supported for clients starting 1.4.0pre2')
+ 'Bundler: inherit_modification="true" is '
+ 'only supported for clients starting '
+ '1.4.0pre2')
data.remove(child)
else:
# no name -- wat