From d1be3c234b86be5c0ff4f0ac616592f4341c201f Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Aug 16 2018 13:22:03 +0000 Subject: PR#978: get_next_release should check also running builds Merges #978 https://pagure.io/koji/pull-request/978 Fixes: #977 https://pagure.io/koji/issue/977 Don't fail image_builds (qcow2) on "build already in progress" --- diff --git a/hub/kojihub.py b/hub/kojihub.py index 5eb8424..2364d0a 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -3661,10 +3661,17 @@ def get_build_logs(build): def get_next_release(build_info): - """find the last successful or deleted build of this N-V""" - values = {'name': build_info['name'], - 'version': build_info['version'], - 'states': (koji.BUILD_STATES['COMPLETE'], koji.BUILD_STATES['DELETED'])} + """find the last successful or deleted build of this N-V. If building is + specified, skip also builds in progress""" + values = { + 'name': build_info['name'], + 'version': build_info['version'], + 'states': ( + koji.BUILD_STATES['COMPLETE'], + koji.BUILD_STATES['DELETED'], + koji.BUILD_STATES['BUILDING'] + ) + } query = QueryProcessor(tables=['build'], joins=['package ON build.pkg_id = package.id'], columns=['build.id', 'release'], clauses=['name = %(name)s', 'version = %(version)s',