summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-03-21 21:32:57 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-03-21 21:32:57 +0000
commit172a4ddb15ec7c39802eb9e160728429c5f98203 (patch)
treeb40ef84cff48d34957eedd04b6c2efb759a9028e
parent98367bec932c3da2243e4243d07f7fceb06484b6 (diff)
downloadbcfg2-172a4ddb15ec7c39802eb9e160728429c5f98203.tar.gz
bcfg2-172a4ddb15ec7c39802eb9e160728429c5f98203.tar.bz2
bcfg2-172a4ddb15ec7c39802eb9e160728429c5f98203.zip
Snapshots: Fix extra entry data import
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5135 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Plugins/Snapshots.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/Snapshots.py b/src/lib/Server/Plugins/Snapshots.py
index 34c1f903c..e7e7a103b 100644
--- a/src/lib/Server/Plugins/Snapshots.py
+++ b/src/lib/Server/Plugins/Snapshots.py
@@ -88,9 +88,10 @@ class Snapshots(Bcfg2.Server.Plugin.Statistics,
build_snap_ent(entry)
for entry in xdata.find('.//Extra'):
if entry.tag in datafields:
- current = dict([(key, unicode(entry.get(key))) \
- for key in datafields[entry.tag]])
- extra[entry.tag][unicode(entry.get('name'))] = current
+ data = build_snap_ent(entry)[1]
+ ename = unicode(entry.get('name'))
+ data['name'] = ename
+ extra[entry.tag][ename] = data
else:
print "extra", entry.tag, entry.get('name')
t2 = time.time()