Renaming --binary to --binary-fields

stamparm · stamparm · commit 6314d64a70ef · 2013-02-13T11:27:03.000+01:00
diff --git a/lib/core/agent.py b/lib/core/agent.py
@@ -344,7 +344,7 @@ def nullAndCastField(self, field):
                 else:
                     nulledCastedField = rootQuery.isnull.query % nulledCastedField
 
-            if conf.hexConvert or conf.binary and field in conf.binary.split(','):
+            if conf.hexConvert or conf.binaryFields and field in conf.binaryFields.split(','):
                 nulledCastedField = self.hexConvertField(nulledCastedField)
 
         return nulledCastedField
diff --git a/lib/core/dicts.py b/lib/core/dicts.py
@@ -205,6 +205,7 @@
 DEPRECATED_OPTIONS = {
                         "--replicate": "use '--dump-format=SQLITE' instead",
                         "--no-unescape": "use '--no-escape' instead",
+                        "--binary": "use '--binary-fields' instead",
                         "--check-payload": None,
                      }
 
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
@@ -665,7 +665,7 @@ def cmdLineParser():
         parser.add_option("--profile", dest="profile", action="store_true",
                           help=SUPPRESS_HELP)
 
-        parser.add_option("--binary", dest="binary",
+        parser.add_option("--binary-fields", dest="binaryFields",
                           help=SUPPRESS_HELP)
 
         parser.add_option("--cpu-throttle", dest="cpuThrottle", type="int",

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,7 @@`
`205`	`205`	`DEPRECATED_OPTIONS = {`
`206`	`206`	`"--replicate": "use '--dump-format=SQLITE' instead",`
`207`	`207`	`"--no-unescape": "use '--no-escape' instead",`
	`208`	`+ "--binary": "use '--binary-fields' instead",`
`208`	`209`	`"--check-payload": None,`
`209`	`210`	`}`
`210`	`211`