mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

Fix multibuild packages in osc results

Browse Source
This commit is contained in:
Daniel Mach 2022-05-10 10:19:09 +02:00
parent 6ccdb9cfe3
commit 55ad41d33b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osc/commandline.py
View File

@ -5454,8 +5454,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
help='more verbose output')
@cmdln.option('--no-multibuild', action='store_true', default=False,
help='Disable results for all direct affect packages inside of the project')
@cmdln.option('-M', '--multibuild-package', action='append', default=[],
help='Only show results for the specified multibuild package')
@cmdln.option('-M', '--multibuild-package', metavar='FLAVOR', action='append', default=[],
help=HELP_MULTIBUILD_MANY)
@cmdln.option('-V', '--vertical', action='store_true',
help='list packages vertically instead horizontally for entire project')
@cmdln.option('-w', '--watch', action='store_true',
@ -5477,7 +5477,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
Usage:
osc results # (inside working copy of PRJ or PKG)
osc results PROJECT [PACKAGE]
osc results PROJECT [PACKAGE[:FLAVOR]]
${cmd_option_list}
"""
@ -5525,7 +5525,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
'code': opts.status_filter}
if opts.multibuild_package:
opts.no_multibuild = False
kwargs['multibuild_packages'] = opts.multibuild_package
resolver = MultibuildFlavorResolver(apiurl, project, package, use_local=False)
kwargs['multibuild_packages'] = resolver.resolve(opts.multibuild_package)
if not opts.no_multibuild:
kwargs['multibuild'] = kwargs['locallink'] = True
if opts.xml or opts.csv:

3
osc/core.py
View File

@ -5968,7 +5968,8 @@ def get_results(apiurl, project, package, verbose=False, printJoin='', *args, **
continue
if multibuild_packages:
l = res['pkg'].rsplit(':', 1)
if len(l) != 2 or l[1] not in multibuild_packages:
if (len(l) != 2 or l[1] not in multibuild_packages) and not (len(l) == 1 and "" in multibuild_packages):
# special case: packages without flavor when multibuild_packages contains an empty string
continue
res['status'] = res['code']
if verbose and res['details'] is not None: