diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-07-21 19:38:06 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-07-21 19:38:06 +0200 |
| commit | b297940aea9b22c6de4e2f7d2fcdbb2db86b107d (patch) | |
| tree | c4d069170739ab710cb3b2e0d6d4168ad5f7bfb5 | |
| parent | 33e53dde2a85b8783c8e4935868d9c5f50dea440 (diff) | |
| download | bcfg2-b297940aea9b22c6de4e2f7d2fcdbb2db86b107d.tar.gz bcfg2-b297940aea9b22c6de4e2f7d2fcdbb2db86b107d.tar.bz2 bcfg2-b297940aea9b22c6de4e2f7d2fcdbb2db86b107d.zip | |
PrioDir: Only set text content, if something is available
This is used for the Rules and Defaults plugins. Without this patch all text
content that was there before (for example file content bound by Cfg) is lost,
for all entries specified in Defaults.
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin/helpers.py | 3 |
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)) |