From 11af0b1bbc2f853c2ff7f49f4471bad17f78091f Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 7 Feb 2012 11:16:03 +0000 Subject: [PATCH] minor fix --- lib/controller/checks.py | 3 +++ lib/core/common.py | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/controller/checks.py b/lib/controller/checks.py index e76ebdeaa..34bb22a47 100644 --- a/lib/controller/checks.py +++ b/lib/controller/checks.py @@ -981,6 +981,9 @@ def checkConnection(suppressOutput=False): logger.critical(errMsg) if any(code in kb.httpErrorCodes for code in (httplib.NOT_FOUND, )): + if conf.multipleTargets: + return False + msg = "it is not recommended to continue in this kind of cases. Do you want to quit and make sure that everything is set up properly? [Y/n] " if readInput(msg, default="Y") not in ("n", "N"): raise sqlmapSilentQuitException diff --git a/lib/core/common.py b/lib/core/common.py index a786f5b31..a9b341697 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -960,8 +960,6 @@ def readInput(message, default=None, checkBatch=True): elif message[-1] == ']': message += " " - message = "\r%s" % message - if checkBatch and conf.batch: if isinstance(default, (list, tuple, set)): options = ",".join(getUnicode(opt, UNICODE_ENCODING) for opt in default) @@ -979,7 +977,7 @@ def readInput(message, default=None, checkBatch=True): data = default else: logging._acquireLock() - dataToStdout(message, True) + dataToStdout("\r%s" % message, True) data = raw_input() #data = raw_input(message.encode(sys.stdout.encoding or UNICODE_ENCODING)) logging._releaseLock()