From 5f6ae1f8f5ccdd62eb427697e6404e0b3854b6e1 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 11 Aug 2021 13:30:52 -0400 Subject: [PATCH] Fix mis-merge: don't try to stripe argv[0] twice --- src/allmydata/scripts/runner.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py index 89265590c..d6c1bfdc7 100644 --- a/src/allmydata/scripts/runner.py +++ b/src/allmydata/scripts/runner.py @@ -325,7 +325,8 @@ def _run_with_reactor(reactor, config, argv, stdout, stderr): :param twisted.python.usage.Options config: The config object to use to parse the argument list. - :param argv: See ``run``. + :param [str] argv: The argument list to parse, *excluding* the name of the + program being run. :param stdout: See ``run``. :param stderr: See ``run``. @@ -334,7 +335,7 @@ def _run_with_reactor(reactor, config, argv, stdout, stderr): """ _setup_coverage(reactor, argv) - argv = list(map(argv_to_unicode, argv[1:])) + argv = list(map(argv_to_unicode, argv)) d = defer.maybeDeferred( parse_or_exit_with_explanation_with_config, config,