1
0
mirror of https://github.com/openSUSE/osc.git synced 2025-09-08 22:18:43 +02:00

-cosmetic changes for rprjresults and rresults

-show Legend for prjresults only, if there are also packages to show
This commit is contained in:
Tom Patzig
2008-05-20 11:36:16 +00:00
parent aba87c08dd
commit 4476afafd7
2 changed files with 6 additions and 23 deletions

View File

@@ -1297,7 +1297,7 @@ class Osc(cmdln.Cmdln):
print '\n'.join(get_results(pac.apiurl, pac.prjname, pac.name))
def do_rresults(self, subcmd, opts, *args):
def do_rresults(self, subcmd, opts, prj, pkg):
"""${cmd_name}: Shows the build results of a remote package
Examples:
@@ -1308,14 +1308,8 @@ class Osc(cmdln.Cmdln):
${cmd_option_list}
"""
if args and len(args) > 2:
print >>sys.stderr, 'getting remote results for more than one package is not supported'
return 2
project = args[0]
pac = args[1]
apiurl = conf.config['apiurl']
print '\n'.join(get_results(apiurl, project, pac))
print '\n'.join(get_results(apiurl, prj, pkg))
@cmdln.option('-q', '--hide-legend', action='store_true',
@@ -1366,7 +1360,7 @@ class Osc(cmdln.Cmdln):
@cmdln.option('-n', '--name-filter', metavar='EXPR',
help='show only packages whos name matches EXPR')
def do_rprjresults(self, subcmd, opts, *args):
def do_rprjresults(self, subcmd, opts, prj):
"""${cmd_name}: Shows project-wide build results of remote Projects
Examples:
@@ -1377,20 +1371,9 @@ class Osc(cmdln.Cmdln):
${cmd_option_list}
"""
if args and len(args) > 1:
print >>sys.stderr, 'getting results for more than one project is not supported'
return 2
if args:
wd = args[0]
else:
print >>sys.stderr, 'specify project name of the remote Project'
return 2
project = wd
apiurl = conf.config['apiurl']
print '\n'.join(get_prj_results(apiurl, project, hide_legend=opts.hide_legend, csv=opts.csv, status_filter=opts.status_filter, name_filter=opts.name_filter))
print '\n'.join(get_prj_results(apiurl, prj, hide_legend=opts.hide_legend, csv=opts.csv, status_filter=opts.status_filter, name_filter=opts.name_filter))
@cmdln.alias('bl')

View File

@@ -2519,7 +2519,7 @@ def get_prj_results(apiurl, prj, hide_legend=False, csv=False, status_filter=Non
pacs_to_show.append(pkg)
pacs = [ i for i in pacs if i in pacs_to_show ]
if len(targets_to_show) is not 0:
if len(targets_to_show):
targets = [ i for i in targets if i in targets_to_show ]
# csv output
@@ -2565,7 +2565,7 @@ def get_prj_results(apiurl, prj, hide_legend=False, csv=False, status_filter=Non
r.append('')
if not hide_legend:
if not hide_legend and len(pacs):
r.append(' Legend:')
for i, j in buildstatus_symbols.items():
r.append(' %s %s' % (j, i))