minor fix

This commit is contained in:
Miroslav Stampar 2012-04-03 12:35:19 +00:00
parent 886aa22efc
commit 7fb190f3b1
2 changed files with 3 additions and 4 deletions

View File

@ -309,14 +309,14 @@ def unionUse(expression, unpack=True, dump=False):
if isNoneValue(items): if isNoneValue(items):
continue continue
kb.locks.value.acquire() kb.locks.value.acquire()
for item in items: for item in arrayizeValue(items):
threadData.shared.value.append(item) threadData.shared.value.append(item)
kb.locks.value.release() kb.locks.value.release()
else: else:
items = output.replace(kb.chars.start, "").replace(kb.chars.stop, "").split(kb.chars.delimiter) items = output.replace(kb.chars.start, "").replace(kb.chars.stop, "").split(kb.chars.delimiter)
if conf.verbose == 1: if conf.verbose == 1:
status = "[%s] [INFO] %s: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(",".join("\"%s\"" % _ for _ in unArrayizeValue(items)))) status = "[%s] [INFO] %s: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(",".join("\"%s\"" % _ for _ in arrayizeValue(unArrayizeValue(items)))))
if len(status) > width: if len(status) > width:
status = "%s..." % status[:width - 3] status = "%s..." % status[:width - 3]

View File

@ -15,6 +15,5 @@ if PYVERSION >= "3" or PYVERSION < "2.6":
exit("[CRITICAL] incompatible Python version detected ('%s'). For successfully running sqlmap you'll have to use version 2.6 or 2.7 (visit \"http://www.python.org/download/\")" % PYVERSION) exit("[CRITICAL] incompatible Python version detected ('%s'). For successfully running sqlmap you'll have to use version 2.6 or 2.7 (visit \"http://www.python.org/download/\")" % PYVERSION)
elif __name__ == "__main__": elif __name__ == "__main__":
from _sqlmap import main from _sqlmap import main
# import needed for proper working of --profile switch from lib.controller.controller import start # needed for proper working of --profile switch
from lib.controller.controller import start
main() main()