From 89e36392f774f4983858bcc89a9790f76931afca Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Sun, 25 Oct 2015 15:32:02 +0100 Subject: [PATCH] Fixes #1486 --- lib/core/common.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 1a43aaf1f..60f0b97a8 100755 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -202,7 +202,7 @@ class Format(object): if versions is None and Backend.getVersionList(): versions = Backend.getVersionList() - return Backend.getDbms() if versions is None else "%s %s" % (Backend.getDbms(), " and ".join(v for v in versions)) + return Backend.getDbms() if versions is None else "%s %s" % (Backend.getDbms(), " and ".join(filter(None, versions))) @staticmethod def getErrorParsedDBMSes(): @@ -471,15 +471,17 @@ class Backend: @staticmethod def getVersion(): - if len(kb.dbmsVersion) > 0: - return kb.dbmsVersion[0] + versions = filter(None, flattenValue(kb.dbmsVersion)) + if not isNoneValue(versions): + return versions[0] else: return None @staticmethod def getVersionList(): - if len(kb.dbmsVersion) > 0: - return kb.dbmsVersion + versions = filter(None, flattenValue(kb.dbmsVersion)) + if not isNoneValue(versions): + return versions else: return None