From 9ad555ee2489ed45c59af1d3b6695972f0402b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 11 Dec 2020 15:11:00 +0100 Subject: [PATCH 1/2] mention flatpack as well --- osc/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc/build.py b/osc/build.py index 38fa6e7bb0..9b040a9cdc 100644 --- a/osc/build.py +++ b/osc/build.py @@ -596,7 +596,7 @@ def main(apiurl, opts, argv): build_type = 'flatpak' if build_type not in ['spec', 'dsc', 'kiwi', 'arch', 'collax', 'livebuild', 'simpleimage', 'snapcraft', 'appimage', 'docker', 'podman', 'fissile', 'flatpak']: raise oscerr.WrongArgs( - 'Unknown build type: \'%s\'. Build description should end in .spec, .dsc, .kiwi, or .livebuild. Or being named PKGBUILD, build.collax, simpleimage, appimage.yml, snapcraft.yaml or Dockerfile' \ + 'Unknown build type: \'%s\'. Build description should end in .spec, .dsc, .kiwi, or .livebuild. Or being named PKGBUILD, build.collax, simpleimage, appimage.yml, snapcraft.yaml, flatpak.json, flatpak.yml, flatpak.yaml or Dockerfile' \ % build_type) if not os.path.isfile(build_descr): raise oscerr.WrongArgs('Error: build description file named \'%s\' does not exist.' % build_descr) From ca080d2118c3abba156471f0dd01fe3c218e9d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 15 Jan 2021 11:21:40 +0100 Subject: [PATCH 2/2] add --lastsucceeded option also for buildlog command introduce --last-succeeded alias --- osc/commandline.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py index 623865f34c..67c342aa7c 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -5553,6 +5553,8 @@ def do_rpmlintlog(self, subcmd, opts, *args): @cmdln.alias('buildlogtail') @cmdln.option('-l', '--last', action='store_true', help='Show the last finished log file') + @cmdln.option('--lastsucceeded', '--last-succeeded', action='store_true', + help='Show the last succeeded log file') @cmdln.option('-M', '--multibuild-package', metavar='MPAC', help='get log of the specified multibuild package') @cmdln.option('-o', '--offset', metavar='OFFSET', @@ -5610,6 +5612,8 @@ def do_buildlog(self, subcmd, opts, *args): query = { 'view': 'entry' } if opts.last: query['last'] = 1 + if opts.lastsucceeded: + query['lastsucceeded'] = 1 u = makeurl(self.get_api_url(), ['build', quote_plus(project), quote_plus(repository), quote_plus(arch), quote_plus(package), '_log'], query=query) f = http_GET(u) root = ET.parse(f).getroot() @@ -5623,7 +5627,7 @@ def do_buildlog(self, subcmd, opts, *args): elif opts.offset: offset = int(opts.offset) strip_time = opts.strip_time or conf.config['buildlog_strip_time'] - print_buildlog(apiurl, quote_plus(project), quote_plus(package), quote_plus(repository), quote_plus(arch), offset, strip_time, opts.last) + print_buildlog(apiurl, quote_plus(project), quote_plus(package), quote_plus(repository), quote_plus(arch), offset, strip_time, opts.last, opts.lastsucceeded) def print_repos(self, repos_only=False, exc_class=oscerr.WrongArgs, exc_msg='Missing arguments', project=None): @@ -5658,7 +5662,7 @@ def print_repos(self, repos_only=False, exc_class=oscerr.WrongArgs, exc_msg='Mis @cmdln.alias('remotebuildlogtail') @cmdln.option('-l', '--last', action='store_true', help='Show the last finished log file') - @cmdln.option('--lastsucceeded', action='store_true', + @cmdln.option('--lastsucceeded', '--last-succeeded', action='store_true', help='Show the last succeeded log file') @cmdln.option('-M', '--multibuild-package', metavar='MPAC', help='show log file for specified multibuild package') @@ -5702,6 +5706,8 @@ def do_remotebuildlog(self, subcmd, opts, *args): query = { 'view': 'entry' } if opts.last: query['last'] = 1 + if opts.lastsucceeded: + query['lastsucceeded'] = 1 u = makeurl(self.get_api_url(), ['build', quote_plus(project), quote_plus(repository), quote_plus(arch), quote_plus(package), '_log'], query=query) f = http_GET(u) root = ET.parse(f).getroot()