From 1b9850b73ae211941e31a7093d5ef2e32f856f6a Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Thu, 3 Feb 2011 12:21:29 +0000
Subject: [PATCH] revert of last commit (conf dictionary has a method "update"
 which caused if conf.update to True always :) )

---
 lib/core/optiondict.py | 2 +-
 lib/core/update.py     | 2 +-
 lib/parse/cmdline.py   | 4 ++--
 sqlmap.conf            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index a80822528..dc8c3bb10 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -155,7 +155,7 @@ optDict = {
                                "flushSession":      "boolean",
                                "forms":             "boolean",
                                "eta":               "boolean",
-                               "update":            "boolean",
+                               "updateAll":         "boolean",
                                "batch":             "boolean"
                              },
 
diff --git a/lib/core/update.py b/lib/core/update.py
index 845f1a7a8..685f46d76 100644
--- a/lib/core/update.py
+++ b/lib/core/update.py
@@ -30,7 +30,7 @@ from lib.core.subprocessng import pollProcess
 from lib.request.connect import Connect as Request
 
 def update():
-    if not conf.update:
+    if not conf.updateAll:
         return
 
     rootDir = paths.SQLMAP_ROOT_PATH
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 2c32b0e4b..c10615cf3 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -467,7 +467,7 @@ def cmdLineParser():
                             help="Display for each output the "
                                       "estimated time of arrival")
 
-        general.add_option("--update", dest="update",
+        general.add_option("--update", dest="updateAll",
                             action="store_true", default=False,
                             help="Update sqlmap")
 
@@ -554,7 +554,7 @@ def cmdLineParser():
         (args, _) = parser.parse_args(args)
 
         if not args.direct and not args.url and not args.list and not args.googleDork and not args.configFile\
-            and not args.requestFile and not args.update and not args.smokeTest and not args.liveTest\
+            and not args.requestFile and not args.updateAll and not args.smokeTest and not args.liveTest\
             and not args.realTest:
             errMsg  = "missing a mandatory parameter ('-d', '-u', '-l', '-r', '-g', '-c' or '--update'), "
             errMsg += "-h for help"
diff --git a/sqlmap.conf b/sqlmap.conf
index 3eeb98e25..387349237 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -514,7 +514,7 @@ eta = False
 
 # Update sqlmap.
 # Valid: True or False
-update = False
+updateAll = False
 
 # Never ask for user input, use the default behaviour.
 # Valid: True or False