]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
samba-tool: more conventional usage of parser.parse_args
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Wed, 7 Sep 2022 03:07:43 +0000 (15:07 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 8 Sep 2022 22:34:36 +0000 (22:34 +0000)
By default parse_args will use sys.argv[1:], which is to say the
command-line without the command name. We have always fed it the
equivalent of sys.argv, then trimmed the command off the result. That
was a bit silly.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/netcmd/__init__.py

index a2ad180b2c3857e56fa42ebbda27d4e9c51f28c8..c51ffc1b2cdbaaf44994974ee924c51c26abcebe 100644 (file)
@@ -166,9 +166,8 @@ class Command(object):
 
     def _run(self, *argv):
         parser, optiongroups = self._create_parser(self.command_name)
-        opts, args = parser.parse_args([self.command_name] + list(argv))
+        opts, args = parser.parse_args(list(argv))
         # Filter out options from option groups
-        args = args[1:]
         kwargs = dict(opts.__dict__)
         for option_group in parser.option_groups:
             for option in option_group.option_list:
@@ -288,7 +287,7 @@ class SuperCommand(Command):
                    f"{self.command_name} <subcommand> (-h|--help)\n")
 
         parser, optiongroups = self._create_parser(self.command_name, epilog=epilog)
-        opts, args = parser.parse_args([self.command_name] + list(argv))
+        opts, args = parser.parse_args(list(argv))
 
         parser.print_help()
         return -1