1
0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-12 08:56:13 +01:00

allow 'osc results PROJECT', as an alternative to 'osc prjresults PROJECT'.

Flagged 'ls' without arguments as deprecated. This should really list
relative to the working directory rather than all projects.
It's now consistent with running 'osc r' in PRJ/PKG working directory.
This commit is contained in:
Juergen Weigert 2010-12-02 23:36:40 +01:00
parent fbfb098a7d
commit 2fd0f1cb95

View File

@ -222,7 +222,7 @@ class Osc(cmdln.Cmdln):
"""${cmd_name}: List sources or binaries on the server """${cmd_name}: List sources or binaries on the server
Examples for listing sources: Examples for listing sources:
ls # list all projects ls # list all projects (deprecated)
ls PROJECT # list packages in a project ls PROJECT # list packages in a project
ls PROJECT PACKAGE # list source files of package of a project ls PROJECT PACKAGE # list source files of package of a project
ls PROJECT PACKAGE <file> # list <file> if this file exists ls PROJECT PACKAGE <file> # list <file> if this file exists
@ -3444,11 +3444,11 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.option('', '--format', default='%(repository)s|%(arch)s|%(state)s|%(dirty)s|%(code)s|%(details)s', @cmdln.option('', '--format', default='%(repository)s|%(arch)s|%(state)s|%(dirty)s|%(code)s|%(details)s',
help='format string for csv output') help='format string for csv output')
def do_results(self, subcmd, opts, *args): def do_results(self, subcmd, opts, *args):
"""${cmd_name}: Shows the build results of a package """${cmd_name}: Shows the build results of a package or project
Usage: Usage:
osc results (inside working copy) osc results # (inside working copy of PRJ or PKG)
osc results remote_project remote_package osc results PROJECT [PACKAGE]
${cmd_option_list} ${cmd_option_list}
""" """
@ -3456,7 +3456,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
args = slash_split(args) args = slash_split(args)
apiurl = self.get_api_url() apiurl = self.get_api_url()
if len(args) == 0: if len(args) < 2:
wd = os.curdir wd = os.curdir
if is_project_dir(wd): if is_project_dir(wd):
opts.csv = None opts.csv = None
@ -3475,10 +3475,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
else: else:
project = store_read_project(wd) project = store_read_project(wd)
package = store_read_package(wd) package = store_read_package(wd)
elif len(args) < 2:
raise oscerr.WrongArgs('Too few arguments (required none or two)')
elif len(args) > 2: elif len(args) > 2:
raise oscerr.WrongArgs('Too many arguments (required none or two)') raise oscerr.WrongArgs('Too many arguments (required none, one, or two)')
else: else:
project = args[0] project = args[0]
package = args[1] package = args[1]