[Openvas-commits] r12977 - in trunk/openvas-plugins: . extra

[scm-commit at wald.intevation.org]

Author: bh
Date: 2012-03-08 12:52:25 +0100 (Thu, 08 Mar 2012)
New Revision: 12977

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/extra/build_oid_map
Log:
* extra/build_oid_map (scan_file): Include OID in error message
about duplicate OIDs.


Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2012-03-08 11:48:10 UTC (rev 12976)
+++ trunk/openvas-plugins/ChangeLog	2012-03-08 11:52:25 UTC (rev 12977)
@@ -1,5 +1,10 @@
 2012-03-08  Bernhard Herzog  <bh at intevation.de>
 
+	* extra/build_oid_map (scan_file): Include OID in error message
+	about duplicate OIDs.
+
+2012-03-08  Bernhard Herzog  <bh at intevation.de>
+
 	* extra/build_oid_map: Extend this script to handle nasl-files
 	that do not use the older script_id function to set the id. Now it
 	also supports nasl-files that assign the complete OID to the

Modified: trunk/openvas-plugins/extra/build_oid_map
===================================================================
--- trunk/openvas-plugins/extra/build_oid_map	2012-03-08 11:48:10 UTC (rev 12976)
+++ trunk/openvas-plugins/extra/build_oid_map	2012-03-08 11:52:25 UTC (rev 12977)
@@ -127,8 +127,9 @@
                     self.mapping[oid] = filename
                 else:
                     if self.verbose > 0:
-                        print >>sys.stderr, ("'%s' and '%s' have the same id"
-                                             % (filename, self.mapping[oid]))
+                        print >>sys.stderr, ("OID %s used by both '%s' and '%s'"
+                                             % (oid, filename,
+                                                self.mapping[oid]))
                 break
         else:
             if self.verbose > 0: