[diffoscope] 01/01: Don't use unicode quotes, otherwise breaks on LC_ALL=C
Ximin Luo
infinity0 at debian.org
Fri Sep 23 18:06:43 CEST 2016
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository diffoscope.
commit f68fcbda11e2bf9c609c28a0be9e3065f566b45c
Author: Ximin Luo <infinity0 at debian.org>
Date: Fri Sep 23 18:06:14 2016 +0200
Don't use unicode quotes, otherwise breaks on LC_ALL=C
---
debian/tests/basic-command-line | 3 +++
diffoscope/main.py | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/tests/basic-command-line b/debian/tests/basic-command-line
index 0bc1679..9cf5979 100755
--- a/debian/tests/basic-command-line
+++ b/debian/tests/basic-command-line
@@ -28,6 +28,9 @@ if [ $? -ne 1 ]; then
exit 1
fi
+echo "Testing LC_ALL=C works"
+LC_ALL=C diffoscope --help >/dev/null
+
echo "Testing invalid command line flag..."
diffoscope --thisflagdoesntexistandwontexist
if [ $? -ne 2 ]; then
diff --git a/diffoscope/main.py b/diffoscope/main.py
index 6ea1bdc..ff8382f 100644
--- a/diffoscope/main.py
+++ b/diffoscope/main.py
@@ -127,11 +127,11 @@ def create_parser():
parser.add_argument('--css', metavar='url', dest='css_url',
help='link to an extra CSS for the HTML report')
parser.add_argument('--jquery', metavar='url', dest='jquery_url',
- help='link to the jquery url, with --html-dir. Specify “disable” to disable JavaScript. When omitted diffoscope will try to create a symlink to a system installation. Known locations: %s' % ', '.join(JQUERY_SYSTEM_LOCATIONS))
+ help='link to the jquery url, with --html-dir. Specify "disable" to disable JavaScript. When omitted diffoscope will try to create a symlink to a system installation. Known locations: %s' % ', '.join(JQUERY_SYSTEM_LOCATIONS))
parser.add_argument('path1', help='first file or directory to compare')
parser.add_argument('path2', help='second file or directory to compare')
if not tlsh:
- parser.epilog = 'File renaming detection based on fuzzy-matching is currently disabled. It can be enabled by installing the “tlsh” module available at https://github.com/trendmicro/tlsh'
+ parser.epilog = 'File renaming detection based on fuzzy-matching is currently disabled. It can be enabled by installing the "tlsh" module available at https://github.com/trendmicro/tlsh'
if argcomplete:
argcomplete.autocomplete(parser)
elif '_ARGCOMPLETE' in os.environ:
@@ -199,7 +199,7 @@ def maybe_set_limit(config, parsed_args, key):
def run_diffoscope(parsed_args):
if not tlsh and Config.general.fuzzy_threshold != parsed_args.fuzzy_threshold:
- logger.warning('Fuzzy-matching is currently disabled as the “tlsh” module is unavailable.')
+ logger.warning('Fuzzy-matching is currently disabled as the "tlsh" module is unavailable.')
maybe_set_limit(Config.general, parsed_args, "max_report_size")
maybe_set_limit(Config.general, parsed_args, "max_report_child_size")
# need to set them in this order due to Config._check_constraints
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git
More information about the diffoscope
mailing list