adding --purge-output to be one of mandatory switches

stamparm · stamparm · commit 697768c01ae9 · 2012-04-23T14:42:24.000Z
diff --git 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
@@ -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
@@ -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)
 
