From b3a0424269efd3f63ff383237c3762941f781722 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Sat, 30 Apr 2011 15:24:15 +0000 Subject: [PATCH] More Backend class method usage refactoring --- lib/takeover/udf.py | 2 +- plugins/generic/filesystem.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/takeover/udf.py b/lib/takeover/udf.py index 945ce7a5a..8c0fcb292 100644 --- a/lib/takeover/udf.py +++ b/lib/takeover/udf.py @@ -105,7 +105,7 @@ class UDF: return output def udfCheckNeeded(self): - if ( not conf.rFile or ( conf.rFile and Backend.getIdentifiedDbms() != DBMS.PGSQL ) ) and "sys_fileread" in self.sysUdfs: + if ( not conf.rFile or ( conf.rFile and not Backend.isDbms(DBMS.PGSQL) ) ) and "sys_fileread" in self.sysUdfs: self.sysUdfs.pop("sys_fileread") if not conf.osPwn: diff --git a/plugins/generic/filesystem.py b/plugins/generic/filesystem.py index a8f3d5ff4..71a92917d 100644 --- a/plugins/generic/filesystem.py +++ b/plugins/generic/filesystem.py @@ -280,7 +280,7 @@ class Filesystem: return None - if fileContent in ( None, "" ) and Backend.getIdentifiedDbms() != DBMS.PGSQL: + if fileContent in ( None, "" ) and not Backend.isDbms(DBMS.PGSQL): self.cleanup(onlyFileTbl=True) return @@ -302,7 +302,7 @@ class Filesystem: fileContent = self.__unhexString(fileContent) rFilePath = dataToOutFile(fileContent) - if Backend.getIdentifiedDbms() != DBMS.PGSQL: + if not Backend.isDbms(DBMS.PGSQL): self.cleanup(onlyFileTbl=True) return rFilePath