From 6931d10ace1a7415395918067ab3996f004e17f8 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 11 Aug 2021 14:40:22 -0400 Subject: [PATCH] Fix mis-merge: use argv parameter instead of sys.argv --- src/allmydata/scripts/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py index 93875a167..a818aafe8 100644 --- a/src/allmydata/scripts/runner.py +++ b/src/allmydata/scripts/runner.py @@ -170,7 +170,7 @@ def parse_or_exit_with_explanation_with_config(config, argv, stdout, stderr): # On Python 2 the string may turn into a unicode string, e.g. the error # may be unicode, in which case it will print funny. Once we're on # Python 3 we can just drop the ensure_str(). - print(six.ensure_str("%s: %s\n" % (sys.argv[0], e)), file=stdout) + print(six.ensure_str("%s: %s\n" % (argv[0], e)), file=stdout) sys.exit(1) return config