[Oval-commits] r48 - in trunk/tools/oval: definition parser

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-06-13 18:31:19 +0000 (Wed, 13 Jun 2007)
New Revision: 48

Modified:
   trunk/tools/oval/definition/generator.py
   trunk/tools/oval/parser/dsa.py
Log:
Uptimize DSA storage structure

Modified: trunk/tools/oval/definition/generator.py
===================================================================
--- trunk/tools/oval/definition/generator.py	2007-06-12 19:25:32 UTC (rev 47)
+++ trunk/tools/oval/definition/generator.py	2007-06-13 18:31:19 UTC (rev 48)
@@ -191,7 +191,7 @@
 		packageCriteria = __createXMLElement ("criteria", attrs={"comment" : "Packages section", "operation" : "OR"})
 	
 		for bpkg in data[stdArch].keys():
-			packageCriteria.appendChild ( __createXMLElement ("criterion", attrs = {"test_ref" : __createDPKGTest(bpkg, data[stdArch][bpkg][0]), "comment" : "%s DPKG is earlier than %s" % (bpkg, data[stdArch][bpkg][0])}))
+			packageCriteria.appendChild ( __createXMLElement ("criterion", attrs = {"test_ref" : __createDPKGTest(bpkg, data[stdArch][bpkg]), "comment" : "%s DPKG is earlier than %s" % (bpkg, data[stdArch][bpkg])}))
 				
 		archDependCriteria.appendChild (packageCriteria)
 		archCriteria.appendChild (archDependCriteria)
@@ -207,7 +207,7 @@
 				packageCriteria = __createXMLElement ("criteria", attrs={"comment" : "Packages section", "operation" : "OR"})
 				
 				for bpkg in data[key].keys():
-					packageCriteria.appendChild ( __createXMLElement ("criterion", attrs = {"test_ref" : __createDPKGTest(bpkg, data[key][bpkg][0]), "comment" : "%s DPKG is earlier than %s" % (bpkg, data[key][bpkg][0])}))
+					packageCriteria.appendChild ( __createXMLElement ("criterion", attrs = {"test_ref" : __createDPKGTest(bpkg, data[key][bpkg]), "comment" : "%s DPKG is earlier than %s" % (bpkg, data[key][bpkg])}))
 				supportedPlatformCriteria.appendChild (packageCriteria)
 				archDependCriteria.appendChild (supportedPlatformCriteria)
 				

Modified: trunk/tools/oval/parser/dsa.py
===================================================================
--- trunk/tools/oval/parser/dsa.py	2007-06-12 19:25:32 UTC (rev 47)
+++ trunk/tools/oval/parser/dsa.py	2007-06-13 18:31:19 UTC (rev 48)
@@ -82,8 +82,8 @@
 						if not version in data["packages"][deb_ver][architecture][package]:
 							data["packages"][deb_ver][architecture][package].append(version)
 					else:
-						data["packages"][deb_ver][architecture][package] = [version]
+						data["packages"][deb_ver][architecture][package] = version
 				else:
-					data["packages"][deb_ver][architecture] = {package : [version]}
+					data["packages"][deb_ver][architecture] = {package : version}
 	
 	return (dsa, data)