summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2015-07-21 21:27:53 -0500
committerSol Jerome <sol.jerome@gmail.com>2015-07-21 21:27:53 -0500
commitc7e67299381df961ff8274e9b53827c2bddbb47b (patch)
tree40a75cbf569ef344bbcde16adbeecff10173a8c9
parenta120c653a8bf2c380cc2d158e5169a9b7d2020a8 (diff)
parentb297940aea9b22c6de4e2f7d2fcdbb2db86b107d (diff)
downloadbcfg2-c7e67299381df961ff8274e9b53827c2bddbb47b.tar.gz
bcfg2-c7e67299381df961ff8274e9b53827c2bddbb47b.tar.bz2
bcfg2-c7e67299381df961ff8274e9b53827c2bddbb47b.zip
Merge branch 'fix-defaults' of https://github.com/AlexanderS/bcfg2
-rw-r--r--src/lib/Bcfg2/Server/Plugin/helpers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index 5cfc8998c..3b62a3217 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -1064,7 +1064,8 @@ class PrioDir(Plugin, Generator, XMLDirectoryBacked):
data = candidate
break
- entry.text = data.text
+ if data.text is not None and data.text.strip() != '':
+ entry.text = data.text
for item in data.getchildren():
entry.append(copy.copy(item))