From e29e8f82f9e0300f6ba17d1b68261251e48c7a13 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 5 Apr 2010 23:09:35 +0000 Subject: [PATCH] fix for "Problem with --dbms set" reported by David Guimaraes --- lib/core/option.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/core/option.py b/lib/core/option.py index ff68f0669..00ed19587 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -494,13 +494,8 @@ def __setDBMS(): logger.debug(debugMsg) conf.dbms = conf.dbms.lower() - firstRegExp = "(%s|%s|%s|%s)" % ("|".join([alias for alias in MSSQL_ALIASES]), - "|".join([alias for alias in MYSQL_ALIASES]), - "|".join([alias for alias in PGSQL_ALIASES]), - "|".join([alias for alias in ORACLE_ALIASES]), - "|".join([alias for alias in SQLITE_ALIASES]), - "|".join([alias for alias in ACCESS_ALIASES]), - "|".join([alias for alias in FIREBIRD_ALIASES])) + aliases = MSSQL_ALIASES + MYSQL_ALIASES + PGSQL_ALIASES + ORACLE_ALIASES + SQLITE_ALIASES + ACCESS_ALIASES + FIREBIRD_ALIASES + firstRegExp = "(%s)" % "|".join([alias for alias in aliases]) dbmsRegExp = re.search("%s ([\d\.]+)" % firstRegExp, conf.dbms) if dbmsRegExp: