From 697768c01ae9f6e981ecd5cc09fe1c4a34a90c16 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 23 Apr 2012 14:42:24 +0000 Subject: [PATCH] adding --purge-output to be one of mandatory switches --- lib/core/option.py | 2 +- lib/core/purge.py | 2 +- lib/parse/cmdline.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/core/option.py b/lib/core/option.py index e6a1f6664..384de0e8b 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -1968,7 +1968,7 @@ def init(inputOptions=AttribDict(), overrideOptions=False): parseTargetUrl() parseTargetDirect() - if any([conf.url, conf.logFile, conf.bulkFile, conf.requestFile, conf.googleDork, conf.liveTest]): + if any((conf.url, conf.logFile, conf.bulkFile, conf.requestFile, conf.googleDork, conf.liveTest)): __setHTTPTimeout() __setHTTPExtraHeaders() __setHTTPCookies() diff --git a/lib/core/purge.py b/lib/core/purge.py index 4917fa556..36d08dc22 100644 --- a/lib/core/purge.py +++ b/lib/core/purge.py @@ -23,7 +23,7 @@ def purge(directory): if not os.path.isdir(directory): return - infoMsg = "purging content of directory ('%s'). Please wait. This could take a while..." % directory + infoMsg = "purging content of directory ('%s'). Please wait as this could take a while" % directory logger.info(infoMsg) filepaths = [] diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py index 76207a374..d8b31a00f 100644 --- a/lib/parse/cmdline.py +++ b/lib/parse/cmdline.py @@ -665,8 +665,8 @@ def cmdLineParser(): break if not any((args.direct, args.url, args.logFile, args.bulkFile, args.googleDork, args.configFile, \ - args.requestFile, args.updateAll, args.smokeTest, args.liveTest, args.realTest, args.wizard, args.dependencies)): - errMsg = "missing a mandatory option (-d, -u, -l, -m, -r, -g, -c, --wizard, --update or --dependencies), " + args.requestFile, args.updateAll, args.smokeTest, args.liveTest, args.realTest, args.wizard, args.dependencies, args.purgeOutput)): + errMsg = "missing a mandatory option (-d, -u, -l, -m, -r, -g, -c, --wizard, --update, --purge-output or --dependencies), " errMsg += "use -h for help" parser.error(errMsg)