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

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-07-17 11:31:46 +0000 (Tue, 17 Jul 2007)
New Revision: 90

Modified:
   trunk/tools/oval/definition/generator.py
   trunk/tools/oval/parser/dsa.py
Log:
Code refactoring. Unified error checking.

Modified: trunk/tools/oval/definition/generator.py
===================================================================
--- trunk/tools/oval/definition/generator.py	2007-07-17 11:12:18 UTC (rev 89)
+++ trunk/tools/oval/definition/generator.py	2007-07-17 11:31:46 UTC (rev 90)
@@ -299,15 +299,15 @@
 	doc = xml.dom.minidom.Document ()
 	
 	if not dsaref.has_key("release"):
-		logging.log(logging.WARNING, "DSA %s: Release definition not well formatted. Ignore this DSA." % dsa)
+		logging.log(logging.ERROR, "DSA %s: Release definition not well formatted. Ignore this DSA." % dsa)
 		raise DSAFormatException
 	
 	if not dsaref.has_key("description"):
-		logging.log(logging.WARNING, "DSA %s: Description information missed. Ignore this DSA." % dsa)
+		logging.log(logging.ERROR, "DSA %s: Description information missed. Ignore this DSA." % dsa)
 		raise DSAFormatException
 	
 	if not dsaref.has_key("packages"):
-		logging.log(logging.WARNING, "DSA %s: Package information missed. Ignore this DSA." % dsa)
+		logging.log(logging.ERROR, "DSA %s: Package information missed. Ignore this DSA." % dsa)
 		raise DSAFormatException
 	
 	### Definition block: Metadata, Notes, Criteria
@@ -335,7 +335,7 @@
 				(ref_id, source) = result.groups()
 				metadata.appendChild ( __createXMLElement ("reference", attrs = {"source" : source, "ref_id" : ref_id, "ref_url" : "http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s" % ref_id}) )
 	else:
-		logging.log(logging.WARNING, "Secrefs None in DSA " + dsa)
+		logging.log(logging.WARNING, "DSA %s: Missing secrefs section." % dsa)
 	
 	#TODO: move this info to other place
 	metadata.appendChild ( __createXMLElement ("description", "What information can i put there?"))
@@ -392,7 +392,7 @@
 		try:
 			definitions.appendChild (createDefinition(dsa, dsaref[dsa]))
 		except DSAFormatException:
-			logging.log (logging.WARNING, "DSA %s: Bad data file. Ignore this DSA." % dsa)
+			logging.log (logging.ERROR, "DSA %s: Bad data file. Ignore this DSA." % dsa)
 			
 	root.appendChild (definitions)
 	

Modified: trunk/tools/oval/parser/dsa.py
===================================================================
--- trunk/tools/oval/parser/dsa.py	2007-07-17 11:12:18 UTC (rev 89)
+++ trunk/tools/oval/parser/dsa.py	2007-07-17 11:31:46 UTC (rev 90)
@@ -87,7 +87,7 @@
 			
 			if data.has_key("release"):
 				if data["release"].has_key(deb_ver):
-					logging.log(logging.WARNING, "DSA %s contain second files section for release %s" % (dsa, deb_ver))
+					logging.log(logging.WARNING, "DSA %s: Found second files section for release %s" % (dsa, deb_ver))
 				else:
 					data["release"][deb_ver] = {}
 			else: