[Oval-commits] r157 - trunk/oval-server

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-08-20 04:36:00 +0000 (Mon, 20 Aug 2007)
New Revision: 157

Removed:
   trunk/oval-server/src/
Modified:
   trunk/oval-server/Dsa2Oval.py
Log:
Cleanups in Dsa2Oval

Modified: trunk/oval-server/Dsa2Oval.py
===================================================================
--- trunk/oval-server/Dsa2Oval.py	2007-08-20 04:31:31 UTC (rev 156)
+++ trunk/oval-server/Dsa2Oval.py	2007-08-20 04:36:00 UTC (rev 157)
@@ -22,7 +22,7 @@
 	"""Print information about script flags and options"""
 
 	print """
-usage: %s [vh] [-d <directory>]
+usage: %s [vh] [-d <directory> | -f <path to file>]
 \t-d\twhich directory use for dsa definition search
 \t-f\twhich file use for dsa definition generation
 \t-v\tverbose mode
@@ -79,7 +79,7 @@
 
 def parsefile (filename):
 	
-	datafile = file[0]
+	datafile = filename
 	(path, ext) = os.path.splitext(datafile)
 	wmlfile = '.'.join((path, 'wml'))
 	
@@ -93,7 +93,7 @@
 	if result:
 		dsaref[result[0]] = result[1]
 					
-	return generator.createOVALDefinitions(self.dsaref)
+	return generator.createOVALDefinitions(dsaref)
 
 if __name__ == "__main__":
     
@@ -104,7 +104,7 @@
     opts['-d'] = "./"
     
     try:
-        opt, args = getopt.getopt (sys.argv[1:], 'vhd:')
+        opt, args = getopt.getopt (sys.argv[1:], 'vhd:f:')
     except getopt.GetoptError:
         usage ()
         sys.exit(1)