summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2007-03-23 14:38:38 +0000
committerNarayan Desai <desai@mcs.anl.gov>2007-03-23 14:38:38 +0000
commite9c03a2270110501f92f5166df1d643589782e88 (patch)
treef005d201bb09e4ec1fac8da5bf3efc5cc7b8e91a /src
parent2658fb67af26cc2d0590e7d62244d61d3685c8f7 (diff)
downloadbcfg2-e9c03a2270110501f92f5166df1d643589782e88.tar.gz
bcfg2-e9c03a2270110501f92f5166df1d643589782e88.tar.bz2
bcfg2-e9c03a2270110501f92f5166df1d643589782e88.zip
Fix remainder of Package-included entries problems
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2992 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Server/Plugin.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index 9a4d8fb1e..9a3b73e82 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -358,8 +358,7 @@ class PrioDir(Plugin, XMLDirectoryBacked):
data = matching[index].cache[1][entry.tag][name]
if data.has_key('__text__'):
entry.text = data['__text__']
- del data['__text__']
if data.has_key('__children__'):
[entry.append(copy.deepcopy(item)) for item in data['__children__']]
- del data['__children__']
- [entry.attrib.__setitem__(key, data[key]) for key in data.keys()]
+ [entry.attrib.__setitem__(key, data[key]) for key in data.keys() \
+ if not key.startswith('__')]