diff --git a/NEWS b/NEWS index 8a8bce9e..779d625b 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ 0.127 - add size limit mode, files can be ignored on checkout or update given a certain size limit. - --csv/--format options for results command - using format user can explicitly specify what he wants print + - support for "unresolvable" state of OBS 2.0 0.126 - added VM autosetup to osc. This requires appropriate OBS version and build script version. diff --git a/dist/osc.complete b/dist/osc.complete index 0a720334..71acd4a9 100644 --- a/dist/osc.complete +++ b/dist/osc.complete @@ -353,7 +353,7 @@ pr|prjresults) ;; -s|--status-filter*) OIFS="$IFS"; IFS=: - builtin compgen -W 'disabled:failed:finished:building:succeeded:broken:scheduled:expansion error:blocked' -- "${cmdline[$count]}" + builtin compgen -W 'disabled:failed:finished:building:succeeded:broken:scheduled:unresolvable:signing:blocked' -- "${cmdline[$count]}" IFS="$OIFS" ;; -p|--project*) diff --git a/osc/commandline.py b/osc/commandline.py index c69d09df..1b8a43eb 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -3767,8 +3767,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. help='Delete all binaries of packages for which the build failed') @cmdln.option('--broken', action='store_true', help='Delete all binaries of packages for which the package source is bad') - @cmdln.option('--expansion', action='store_true', - help='Delete all binaries of packages which have expansion errors') + @cmdln.option('--unresolvable', action='store_true', + help='Delete all binaries of packages which have dependency errors') @cmdln.option('--all', action='store_true', help='Delete all binaries regardless of the package status (previously default)') def do_wipebinaries(self, subcmd, opts, *args): @@ -3801,8 +3801,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. codes.append('failed') if opts.broken: codes.append('broken') - if opts.expansion: - codes.append('expansion error') + if opts.unresolvable: + codes.append('unresolvable') if opts.all or opts.repo or opts.arch: codes.append(None) diff --git a/osc/core.py b/osc/core.py index bfc825b8..29153914 100644 --- a/osc/core.py +++ b/osc/core.py @@ -185,7 +185,8 @@ new_pattern_template = """\ buildstatus_symbols = {'succeeded': '.', 'disabled': ' ', - 'expansion error': 'E', + 'expansion error': 'E', # obsolete with OBS 2.0 + 'unresolvable': 'U', 'failed': 'F', 'broken': 'B', 'blocked': 'b', @@ -3569,7 +3570,7 @@ def get_package_results(apiurl, prj, package, lastbuild=None, repository=[], arc rmap['code'] = statusnode.get('code', '') rmap['details'] = '' - if rmap['code'] in ('expansion error', 'broken', 'blocked', 'finished'): + if rmap['code'] in ('unresolvable', 'expansion error', 'broken', 'blocked', 'finished'): details = statusnode.find('details') if details != None: rmap['details'] = details.text