From fe057c77ae70a6d1c08119379d2599ba5a623504 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 16 Aug 2012 14:42:26 -0500 Subject: [PATCH 1/2] Robusticize fedora-review flag check. --- scripts/process-git-requests/process-git-requests | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/process-git-requests/process-git-requests b/scripts/process-git-requests/process-git-requests index 3f06298..afceae8 100755 --- a/scripts/process-git-requests/process-git-requests +++ b/scripts/process-git-requests/process-git-requests @@ -485,9 +485,13 @@ def process_new_request(bug, comment, allcomments, firstfound, pkgdb, fas, branc warned = True frflag = bug.get_flags('fedora-review') - if frflag[0]['status'] != '+': - warnings.append("WARNING: fedora-review flag not set to '+'") + if not frflag[0]['status']: + warnings.append("WARNING: fedora-review flag not set") warned = True + else: + if frflag[0]['status'] != '+': + warnings.append("WARNING: fedora-review flag not set to '+'") + warned = True if frflag[0]['setter_email'] == bug.reporter: warnings.append("WARNING: fedora-review flag set by review submitter! Verify that review was approved by reviewer!") warned = True From e1b2f9aea0988b4448efa507da92e657f3638d83 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 17 Aug 2012 06:04:25 -0500 Subject: [PATCH 2/2] Even more robust flag checking. --- scripts/process-git-requests/process-git-requests | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/process-git-requests/process-git-requests b/scripts/process-git-requests/process-git-requests index afceae8..f631c22 100755 --- a/scripts/process-git-requests/process-git-requests +++ b/scripts/process-git-requests/process-git-requests @@ -485,16 +485,16 @@ def process_new_request(bug, comment, allcomments, firstfound, pkgdb, fas, branc warned = True frflag = bug.get_flags('fedora-review') - if not frflag[0]['status']: + if not frflag: warnings.append("WARNING: fedora-review flag not set") warned = True else: if frflag[0]['status'] != '+': warnings.append("WARNING: fedora-review flag not set to '+'") warned = True - if frflag[0]['setter_email'] == bug.reporter: - warnings.append("WARNING: fedora-review flag set by review submitter! Verify that review was approved by reviewer!") - warned = True + if frflag[0]['setter_email'] == bug.reporter: + warnings.append("WARNING: fedora-review flag set by review submitter! Verify that review was approved by reviewer!") + warned = True m=re.search('Review Request:\s+([a-zA-Z0-9_+.-]+)\s+', bug.summary, re.I) if not m: