minor update

This commit is contained in:
Miroslav Stampar 2012-02-24 11:25:56 +00:00
parent 1f6ce265b9
commit b481c0352f
2 changed files with 2 additions and 4 deletions

View File

@ -734,7 +734,7 @@ def dataToStdout(data, forceOutput=False):
sys.stdout.flush()
if kb.get("multiThreadMode"):
logging._releaseLock()
setFormatterPrependFlag(len(data) == 1 and data != '\n')
setFormatterPrependFlag(len(data) == 1 and data != '\n' or len(data) > 2 and data[0] == '\r' and data[-1] != '\n')
def dataToSessionFile(data):
if not conf.sessionFile or kb.suppressSession:

View File

@ -137,7 +137,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
dataToStdout("[%s] [INFO] retrieved: %s" % (time.strftime("%X"), "_" * min(length, conf.progressWidth)))
dataToStdout("\r[%s] [INFO] retrieved: " % time.strftime("%X"))
else:
dataToStdout("[%s] [INFO] retrieved: " % time.strftime("%X"))
dataToStdout("\r[%s] [INFO] retrieved: " % time.strftime("%X"))
hintlock = threading.Lock()
@ -320,8 +320,6 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
progress.update(index)
progress.draw(eta)
setFormatterPrependFlag(True)
# Go multi-threading (--threads > 1)
if conf.threads > 1 and isinstance(length, int) and length > 1:
value = []