[Oval-commits] r79 - in trunk/tools: . oval/definition

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-07-13 17:24:51 +0000 (Fri, 13 Jul 2007)
New Revision: 79

Removed:
   trunk/tools/BugedDSA
Modified:
   trunk/tools/TODO
   trunk/tools/oval/definition/generator.py
Log:
Remove deprecated code

Deleted: trunk/tools/BugedDSA
===================================================================
--- trunk/tools/BugedDSA	2007-07-13 17:22:34 UTC (rev 78)
+++ trunk/tools/BugedDSA	2007-07-13 17:24:51 UTC (rev 79)
@@ -1,22 +0,0 @@
-This file contain list of dsa files with bad formating which currently confuse parseDsa2Oval script:
-
-Which:		Old dsa in format of yyyymmdd[n].data
-Reason:	Wrong filename format
-Solution:	Ignoring this dsa???
-
-Which: 	dsa-0[999].data
-Reason: 	Number with leading zero.
-Solution:	trim leading zero
-
-Which:		dsa-119.data, dsa-978.data, dsa-205.data, dsa-1236.data
-Reason:	Empty packages part
-Solution:	generator must more stricly checks input data
-
-Which:		dsa-117.data, dsa-1116.data, dsa-1329.data
-Reason:	Bad release string (not contain release number, or nonstandart format)
-Solution:  Rewrite regexp or ???
-
-Which:		dsa-288.data
-Reason:	Unknown
-Solution:	
-

Modified: trunk/tools/TODO
===================================================================
--- trunk/tools/TODO	2007-07-13 17:22:34 UTC (rev 78)
+++ trunk/tools/TODO	2007-07-13 17:24:51 UTC (rev 79)
@@ -1,9 +1,6 @@
 General:
 	Rewrite structure for represent DSA information. (dict to class)
-		
-oval/definition/generator.py:
-	Rewrite tests generation conform to linux-definition-schema
-	 
+			 
 Future:
 	General
 		Full refactoring of project source code

Modified: trunk/tools/oval/definition/generator.py
===================================================================
--- trunk/tools/oval/definition/generator.py	2007-07-13 17:22:34 UTC (rev 78)
+++ trunk/tools/oval/definition/generator.py	2007-07-13 17:24:51 UTC (rev 79)
@@ -273,66 +273,7 @@
 		
 		archDependCriteria.appendChild (supportedPlatformCriteria)
 		archCriteria.appendChild (archDependCriteria)	
-		 
-#	# We must check that bpackages for all supported architectures is qeuals
-#	stdPkg = None
-#	stdArch = ""
-#	diffCount = -1
-#	for (key, value) in data.iteritems():
-#		if key != "all":
-#			if stdPkg == None:
-#				stdPkg = value
-#				stdArch = key
-#				diffCount = 0
-#			else:
-#				if stdPkg != value:
-#					diffCount += 1
-#					logging.log(logging.ERROR, "Bpackages differ [" + str(diffCount) + "] in " + dsa + "[" + version + "] for " + stdArch + " and " + key + "\n\n")
-#					logging.log(logging.ERROR, stdPkg)
-#					logging.log(logging.ERROR, value)
-#					if diffCount == 1:
-#						logging.log(logging.INFO, stdPkg)
-#						logging.log(logging.INFO, value)
-#	
-#	# Now, since we have multiple architectures.. go into loop
-#	# Notice: this code is assuming all the architectures are using the same binary package versions which migth not necessarily be true..
-#
-#
-#	if diffCount == 0:
-#		# All supported architectures have queuals bpackages
-#		
-#		archDependCriteria = __createXMLElement ("criteria", attrs={"comment" : "Architecture depended section", "operator" : "AND"})
-#		supportedArchCriteria = __createXMLElement ("criteria", attrs={"comment" : "Supported architectures section", "operator" : "OR"})
-#		for arch in data.keys():
-#			if arch != "all":
-#				supportedArchCriteria.appendChild ( __createXMLElement ("criterion", attrs = {"test_ref" : __createTest("arch", arch), "comment" : "%s architecture" % arch}))
-#				archDependCriteria.appendChild (supportedArchCriteria)
-#
-#		packageCriteria = __createXMLElement ("criteria", attrs={"comment" : "Packages section", "operator" : "OR"})
-#	
-#		for bpkg in data[stdArch].keys():
-#			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)
-#		
-#	if diffCount > 0:
-#		# Supported architectures have different bpackages. On this stage we generate package list for each architecture
-#		archDependCriteria = __createXMLElement ("criteria", attrs={"comment" : "Architecture depended section", "operation" : "OR"})
-#		
-#		for (key, value) in data.iteritems():
-#			if key != "all":
-#				supportedPlatformCriteria = __createXMLElement ("criteria", attrs={"comment" : "Supported platform section", "operation" : "AND"})
-#				supportedPlatformCriteria.appendChild ( __createXMLElement ("criterion", attrs = {"test_ref" : __createTest("arch", key), "comment" : "%s architecture" % key}))
-#				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]), "comment" : "%s DPKG is earlier than %s" % (bpkg, data[key][bpkg])}))
-#				supportedPlatformCriteria.appendChild (packageCriteria)
-#				archDependCriteria.appendChild (supportedPlatformCriteria)
-#				
-#		archCriteria.appendChild (archDependCriteria)
-	
+		 	
 	softwareCriteria.appendChild (archCriteria)	
 	
 	return (softwareCriteria)