[Oval-commits] r75 - trunk/tools/oval/definition

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-07-12 17:54:55 +0000 (Thu, 12 Jul 2007)
New Revision: 75

Modified:
   trunk/tools/oval/definition/generator.py
Log:
Fix problem with leading zero in some dsa numbers.

Modified: trunk/tools/oval/definition/generator.py
===================================================================
--- trunk/tools/oval/definition/generator.py	2007-07-12 07:21:46 UTC (rev 74)
+++ trunk/tools/oval/definition/generator.py	2007-07-12 17:54:55 UTC (rev 75)
@@ -12,6 +12,7 @@
 import datetime
 import xml.dom.ext
 import xml.dom.minidom
+import sys
 from oval.definition.differ import differ
 
 def __createXMLElement (name, descr = None, attrs = {}):
@@ -52,6 +53,11 @@
 releaseArchHash = {"2.0" : 2, "2.1" : 4, "2.2":  6, "3.0" : 11, "3.1" : 12, "4.0" : 11}
 testsHash = {"arch" : {}, "release": {}, "dpkgObj": {}, "dpkgSte": {}} 
 
+def __trimzero (val):
+	value = val[:]
+	while value[0] == "0":
+		value = value[1:]
+	return value
 
 def __getNewId (type):
 	"""Generate new unique id for tests, objects or states
@@ -343,8 +349,8 @@
 
 	### Definition block: Metadata, Notes, Criteria
 	### TODO: Replace DSA id with unique id
-	definition = __createXMLElement ("definition", attrs = {"id" : "oval:org.debian:def:%s" % dsa, "version" : "1", "class" : "vulnerability"})
-
+	definition = __createXMLElement ("definition", attrs = {"id" : "oval:org.debian:def:%s" % __trimzero(dsa), "version" : "1", "class" : "vulnerability"})
+	
 	### Definition : Metadata : title, affected, reference, description ###
 	metadata = __createXMLElement ("metadata")
 	metadata.appendChild (__createXMLElement ("title", dsaref["description"]))