fix for that banner fetching issue reported by Daniel Huckmann

stamparm · stamparm · commit c93e26526950 · 2010-03-01T10:33:36.000Z
diff --git a/lib/parse/banner.py b/lib/parse/banner.py
@@ -45,6 +45,7 @@ def __init__(self, banner, info):
         self.__inServicePack = False
         self.__release       = None
         self.__version       = ""
+        self.__versionAlt    = None
         self.__servicePack   = ""
         self.__info          = info
 
@@ -74,17 +75,23 @@ def characters(self, data):
 
     def endElement(self, name):
         if name == "signature":
-            if re.search(" %s[\.\ ]+" % self.__version, self.__banner):
-                self.__feedInfo("dbmsRelease", self.__release)
-                self.__feedInfo("dbmsVersion", self.__version)
-                self.__feedInfo("dbmsServicePack", self.__servicePack)
+            for version in (self.__version, self.__versionAlt):
+                if version and re.search(" %s[\.\ ]+" % version, self.__banner):
+                    self.__feedInfo("dbmsRelease", self.__release)
+                    self.__feedInfo("dbmsVersion", self.__version)
+                    self.__feedInfo("dbmsServicePack", self.__servicePack)
+                    break
 
             self.__version     = ""
+            self.__versionAlt  = None
             self.__servicePack = ""
 
         elif name == "version":
             self.__inVersion = False
             self.__version = self.__version.replace(" ", "")
+            
+            match = re.search(r"\A(?P<major>\d+)\.00\.(?P<build>\d+)\Z", self.__version)
+            self.__versionAlt = "%s.0.%s.0" % (match.group('major'), match.group('build')) if match else None
 
         elif name == "servicepack":
             self.__inServicePack = False
