refactoring

bdamele · bdamele · commit d2bd275652ed · 2012-12-17T14:07:28.000Z
diff --git a/plugins/generic/databases.py b/plugins/generic/databases.py
@@ -257,12 +257,11 @@ def getTables(self, bruteForce=None):
                 if not Backend.isDbms(DBMS.SQLITE):
                     query += " WHERE %s" % condition
                     query += " IN (%s)" % ",".join("'%s'" % unsafeSQLIdentificatorNaming(db) for db in sorted(dbs))
-                if conf.excludeSysDbs:
-                    if Backend.isDbms(DBMS.SQLITE):
-                        query += " WHERE "
-                    query += " AND ".join("%s != '%s'" % (condition, unsafeSQLIdentificatorNaming(db)) for db in self.excludeDbsList)
-                    infoMsg = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList))
-                    logger.info(infoMsg)
+
+                    if conf.excludeSysDbs:
+                        query += " AND ".join("%s != '%s'" % (condition, unsafeSQLIdentificatorNaming(db)) for db in self.excludeDbsList)
+                        infoMsg = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList))
+                        logger.info(infoMsg)
 
                 if len(dbs) < 2 and ("%s," % condition) in query:
                     query = query.replace("%s," % condition, "", 1)
