From 32aab1393d6cb9f8fcdaf583d30766a147f27271 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 18 2017 10:27:49 +0000 Subject: Merge pull request #409 from fedora-infra/fix_bug Fix bug: missing variable `status` -- thanks unit-tests --- diff --git a/pkgdb2/lib/__init__.py b/pkgdb2/lib/__init__.py index 2e54948..58ef966 100644 --- a/pkgdb2/lib/__init__.py +++ b/pkgdb2/lib/__init__.py @@ -524,9 +524,11 @@ def update_pkg_poc(session, namespace, pkg_name, pkg_branch, pkg_poc, user, pkglisting.point_of_contact = pkg_poc prev_status = pkglisting.status + status = None session.flush() if pkg_poc == 'orphan': pkglisting.status = 'Orphaned' + status = 'Orphaned' # Remove commit and watchcommits if the user has them for acl in ['commit', 'approveacls']: if has_acls( @@ -544,6 +546,7 @@ def update_pkg_poc(session, namespace, pkg_name, pkg_branch, pkg_poc, user, ) elif pkglisting.status in ('Orphaned', 'Retired'): pkglisting.status = 'Approved' + status = 'Approved' for acl in ACLS: if not has_acls( session, pkg_poc, namespace, pkg_name, @@ -571,7 +574,7 @@ def update_pkg_poc(session, namespace, pkg_name, pkg_branch, pkg_poc, user, package_listing=pkglisting.to_json(), ) ) - if prev_status != 'Approved': + if prev_status != status and status is not None: pkgdb2.lib.utils.log( session, pkglisting.package,