From 282496ed8e99ea36c3259c937f92e4ab24adb8c0 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Jun 25 2018 06:09:18 +0000 Subject: Make option --name and --namespace reusable These two options could be reused in other command to get input of package repository name and/or namespace. Signed-off-by: Chenxiong Qi --- diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py index 57a5c2d..ef420af 100644 --- a/pyrpkg/cli.py +++ b/pyrpkg/cli.py @@ -337,10 +337,27 @@ class cliClient(object): def setup_argparser(self): """Setup the argument parser and register some basic commands.""" + self.repo_name_namespace_args = ArgumentParser(add_help=False) + self.repo_name_namespace_args.add_argument( + '--name', + metavar='NAME', + dest='repo_name', + help='Override repository name. Use --namespace option to change ' + 'namespace. If not specified, name is discovered from Git ' + 'push URL or Git URL (last part of path with .git extension ' + 'removed) or from Name macro in spec file, in that order.') + self.repo_name_namespace_args.add_argument( + '--namespace', + metavar='NAMESPACE', + dest='repo_namespace', + help='The package repository namespace. If omitted, default to ' + 'rpms if namespace is enabled.') + self.parser = ArgumentParser( prog=self.name, epilog='For detailed help pass --help to a target', - allow_abbrev=False) + allow_abbrev=False, + parents=[self.repo_name_namespace_args]) # Add some basic arguments that should be used by all. # Add a config file self.parser.add_argument('--config', '-C', @@ -371,20 +388,6 @@ class cliClient(object): 'Git push URL or Git URL (last part of path with .git ' 'extension removed) or from name macro in spec file. In that ' 'order.') - self.parser.add_argument( - '--name', - metavar='NAME', - dest='repo_name', - help='Override repository name. Use --namespace option to change ' - 'namespace. If not specified, name is discovered from Git ' - 'push URL or Git URL (last part of path with .git extension ' - 'removed) or from Name macro in spec file, in that order.') - self.parser.add_argument( - '--namespace', - metavar='NAMESPACE', - dest='repo_namespace', - help='The package repository namespace. If omitted, default to ' - 'rpms if namespace is enabled.') # Override the discovered user name self.parser.add_argument('--user', default=None, help='Override the discovered user name')