mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-09 12:35:48 +01:00
Code

support OBS 2.0 "unresolvable" state, former expansion error state is still supported.

Browse Source
This commit is contained in:
Adrian Schröter 2010-04-23 14:38:00 +02:00
parent fc27b4816b
commit 4db40e23f5
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,6 +1,7 @@
0.127 0.127
- add size limit mode, files can be ignored on checkout or update given a certain size limit. - 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 - --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 0.126
- added VM autosetup to osc. This requires appropriate OBS version and build script version. - added VM autosetup to osc. This requires appropriate OBS version and build script version.

2
dist/osc.complete vendored
View File

@ -353,7 +353,7 @@ pr|prjresults)
;; ;;
-s|--status-filter*) -s|--status-filter*)
OIFS="$IFS"; IFS=: 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" IFS="$OIFS"
;; ;;
-p|--project*) -p|--project*)

8
osc/commandline.py
View File

@ -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') help='Delete all binaries of packages for which the build failed')
@cmdln.option('--broken', action='store_true', @cmdln.option('--broken', action='store_true',
help='Delete all binaries of packages for which the package source is bad') help='Delete all binaries of packages for which the package source is bad')
@cmdln.option('--expansion', action='store_true', @cmdln.option('--unresolvable', action='store_true',
help='Delete all binaries of packages which have expansion errors') help='Delete all binaries of packages which have dependency errors')
@cmdln.option('--all', action='store_true', @cmdln.option('--all', action='store_true',
help='Delete all binaries regardless of the package status (previously default)') help='Delete all binaries regardless of the package status (previously default)')
def do_wipebinaries(self, subcmd, opts, *args): 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') codes.append('failed')
if opts.broken: if opts.broken:
codes.append('broken') codes.append('broken')
if opts.expansion: if opts.unresolvable:
codes.append('expansion error') codes.append('unresolvable')
if opts.all or opts.repo or opts.arch: if opts.all or opts.repo or opts.arch:
codes.append(None) codes.append(None)

5
osc/core.py
View File

@ -185,7 +185,8 @@ new_pattern_template = """\
buildstatus_symbols = {'succeeded': '.', buildstatus_symbols = {'succeeded': '.',
'disabled': ' ', 'disabled': ' ',
'expansion error': 'E', 'expansion error': 'E', # obsolete with OBS 2.0
'unresolvable': 'U',
'failed': 'F', 'failed': 'F',
'broken': 'B', 'broken': 'B',
'blocked': 'b', 'blocked': 'b',
@ -3569,7 +3570,7 @@ def get_package_results(apiurl, prj, package, lastbuild=None, repository=[], arc
rmap['code'] = statusnode.get('code', '') rmap['code'] = statusnode.get('code', '')
rmap['details'] = '' 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') details = statusnode.find('details')
if details != None: if details != None:
rmap['details'] = details.text rmap['details'] = details.text