keeping things neat and tidy

This commit is contained in:
Miroslav Stampar 2010-10-25 12:33:49 +00:00
parent 32728d14b7
commit 9a3879feba

View File

@ -987,7 +987,8 @@ def __cleanupOptions():
conf.multipleTargets = True conf.multipleTargets = True
if conf.optimize: if conf.optimize:
conf.predictOutput = conf.keepAlive = True #conf.predictOutput = True
conf.keepAlive = True
conf.nullConnection = not conf.textOnly conf.nullConnection = not conf.textOnly
conf.threads = 4 if conf.threads < 2 else conf.threads conf.threads = 4 if conf.threads < 2 else conf.threads
@ -1229,6 +1230,10 @@ def __basicOptionValidation():
errMsg = "switch --data is incompatible with switch --null-connection" errMsg = "switch --data is incompatible with switch --null-connection"
raise sqlmapSyntaxException, errMsg raise sqlmapSyntaxException, errMsg
if conf.predictOutput and conf.threads > 1:
errMsg = "switch --predict-output is incompatible with switch --threads"
raise sqlmapSyntaxException, errMsg
def init(inputOptions=advancedDict()): def init(inputOptions=advancedDict()):
""" """
Set attributes into both configuration and knowledge base singletons Set attributes into both configuration and knowledge base singletons