[Oval-commits] r158 - trunk/oval-server
Pavel Vinogradov
blaze-guest at alioth.debian.org
Mon Aug 20 04:42:28 UTC 2007
Author: blaze-guest
Date: 2007-08-20 04:42:28 +0000 (Mon, 20 Aug 2007)
New Revision: 158
Modified:
trunk/oval-server/Dsa2Oval.py
Log:
Updates in Dsa2Oval
Modified: trunk/oval-server/Dsa2Oval.py
===================================================================
--- trunk/oval-server/Dsa2Oval.py 2007-08-20 04:36:00 UTC (rev 157)
+++ trunk/oval-server/Dsa2Oval.py 2007-08-20 04:42:28 UTC (rev 158)
@@ -86,13 +86,21 @@
#Parse data file
result = dsa.parseFile (datafile)
if result:
- dsaref[result[0]] = result[1]
+ if dsaref.has_key (result[0]):
+ for (k, v) in result[1].iteritems():
+ dsaref[result[0]][k] = v
+ else:
+ dsaref[result[0]] = result[1]
#Parse wml file
result = wml.parseFile(wmlfile)
if result:
- dsaref[result[0]] = result[1]
-
+ if dsaref.has_key (result[0]):
+ for (k, v) in result[1].iteritems():
+ dsaref[result[0]][k] = v
+ else:
+ dsaref[result[0]] = result[1]
+
return generator.createOVALDefinitions(dsaref)
if __name__ == "__main__":
More information about the Oval-commits
mailing list