mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-09-20 01:06:17 +02:00
Code

Merge pull request #1152 from dmach/argparse-and-cli-fixes

Browse Source 
Argparse and cli fixes
This commit is contained in:
Daniel Mach 2022-10-03 09:42:09 +02:00 committed by GitHub
commit d57a373874
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osc/build.py
View File

@ -762,8 +762,8 @@ def main(apiurl, opts, argv):
if opts.multibuild_package:
buildargs.append('--buildflavor=%s' % opts.multibuild_package)
pac = pac + ":" + opts.multibuild_package
if opts.verbose:
buildargs.append('--verbose=%s' % opts.verbose)
if opts.verbose_mode:
buildargs.append('--verbose=%s' % opts.verbose_mode)
if opts.wipe:
buildargs.append("--wipe")

11
osc/cmdln.py
View File

@ -169,15 +169,16 @@ class Cmdln:
help=help_text,
description=help_desc,
prog=self.get_subcommand_prog(cmd_name),
formatter_class=HelpFormatter
formatter_class=HelpFormatter,
conflict_handler="resolve",
)
# add hidden copy of global options so they can be used in any place
self.add_global_options(subparser, suppress=True)
# add sub-command options, overriding hidden copies of global options if needed (due to conflict_handler="resolve")
for option_args, option_kwargs in options:
try:
subparser.add_argument(*option_args, **option_kwargs)
except argparse.ArgumentError as e:
print(f"WARNING: Could not add argument '{e.argument_name}' to the '{cmd_name}' sub-command: {e}", file=sys.stderr)
subparser.add_argument(*option_args, **option_kwargs)
def argparse_error(self, *args, **kwargs):
"""

13
osc/commandline.py
View File

@ -18,7 +18,6 @@ import time
import traceback
from functools import cmp_to_key
from operator import itemgetter
from optparse import SUPPRESS_HELP
from urllib.parse import urlsplit
from urllib.error import HTTPError
@ -5825,6 +5824,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.option('--alternative-project', metavar='PROJECT',
help='specify the build target project')
@cmdln.option('-d', '--debug', action='store_true', dest="debug_dependencies",
help='verbose output of build dependencies')
@cmdln.option('-M', '--multibuild-package', metavar='FLAVOR',
help=HELP_MULTIBUILD_ONE)
@cmdln.option('-x', '--extra-pkgs', metavar='PAC', action='append',
@ -5910,7 +5911,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
print(decode_it(get_buildinfo(apiurl,
project, package, repository, arch,
specfile=build_descr_data,
debug=opts.debug,
debug=opts.debug_dependencies,
addlist=opts.extra_pkgs)))
def do_buildconfig(self, subcmd, opts, *args):
@ -6343,15 +6344,17 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.option('--disable-cpio-bulk-download', action='store_true',
help='disable downloading packages as cpio archive from api')
@cmdln.option('--cpio-bulk-download', action='store_false',
dest='disable_cpio_bulk_download', help=SUPPRESS_HELP)
dest='disable_cpio_bulk_download', help=argparse.SUPPRESS)
@cmdln.option('--download-api-only', action='store_true',
help='only fetch packages from the api')
@cmdln.option('--oldpackages', metavar='DIR',
help='take previous build from DIR (special values: _self, _link)')
@cmdln.option('--verbose-mode', metavar='MODE',
help='set verbose mode of the "build" program, arguments can be "all" or "vm"')
@cmdln.option('--wipe', action='store_true',
help=SUPPRESS_HELP)
help=argparse.SUPPRESS)
@cmdln.option('--shell', action='store_true',
help=SUPPRESS_HELP)
help=argparse.SUPPRESS)
@cmdln.option('--shell-after-fail', action='store_true',
help="run a shell if the build tool fails")
@cmdln.option('--shell-cmd', metavar='COMMAND',