From 6314d64a70ef7478c5603ba381990e8438a8f275 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 13 Feb 2013 11:27:03 +0100 Subject: [PATCH] Renaming --binary to --binary-fields --- lib/core/agent.py | 2 +- lib/core/dicts.py | 1 + lib/parse/cmdline.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/core/agent.py b/lib/core/agent.py index 11668d901..60490c971 100644 --- a/lib/core/agent.py +++ b/lib/core/agent.py @@ -344,7 +344,7 @@ class Agent(object): 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 index 4703a858f..bef9b135b 100644 --- a/lib/core/dicts.py +++ b/lib/core/dicts.py @@ -205,6 +205,7 @@ POST_HINT_CONTENT_TYPES = { 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 index a62e2525b..432c6bd63 100644 --- 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",