From 6677da63cd110ad735838c690b15ccda0d2d3145 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 13 Jul 2012 14:25:39 +0200 Subject: [PATCH] Fix for an Issue #88 --- lib/takeover/web.py | 3 ++- plugins/generic/misc.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/takeover/web.py b/lib/takeover/web.py index 7f95492b4..55f69db96 100644 --- a/lib/takeover/web.py +++ b/lib/takeover/web.py @@ -306,7 +306,8 @@ class Web: self.webBackdoorUrl = "%s/%s" % (self.webBaseUrl, backdoorName) self.webDirectory = localPath - self.webBackdoorFilePath = ntToPosixSlashes(normalizePath("%s/%s" % (localPath, backdoorName))).replace("//", "/").rstrip('/') + + self.webBackdoorFilePath = ntToPosixSlashes(normalizePath("%s/%s" % (localPath, backdoorName))).replace("//", "/").rstrip('/') testStr = "command execution test" output = self.webBackdoorRunCmd("echo %s" % testStr) diff --git a/plugins/generic/misc.py b/plugins/generic/misc.py index 5747796cc..e2851e894 100644 --- a/plugins/generic/misc.py +++ b/plugins/generic/misc.py @@ -89,6 +89,9 @@ class Miscellaneous: kb.bannerFp["dbmsVersion"] = (kb.bannerFp["dbmsVersion"] or "").replace(",", "").replace("-", "").replace(" ", "") def delRemoteFile(self, filename): + if not filename: + return + self.checkDbmsOs() if Backend.isOs(OS.WINDOWS):