From 01951f7832b1ec647bdd72248936e286c7e9e71b Mon Sep 17 00:00:00 2001 From: James Laska Date: Fri, 8 Apr 2011 10:25:56 -0400 Subject: Display hotdog if no blockers exist. Updated NTH working from bruno. --- update-blocker-wiki | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/update-blocker-wiki b/update-blocker-wiki index 3afef15..e33f06e 100755 --- a/update-blocker-wiki +++ b/update-blocker-wiki @@ -209,9 +209,11 @@ if __name__ == '__main__': ''' % (os.path.basename(sys.argv[0]),) - # Start with the dog - if opts.hotdog: + # Display hotdog if requested, or if no blockers (approved or proposed) exist + if opts.hotdog or \ + (not accepted_blocker_by_component and not proposed_blocker_by_component): page_content += '[[File:Hotdog.gif|right]]' + # Otherwise, display release logo else: page_content += '[[File:F{{FedoraVersionNumber|next}}_anaconda_center.png|right]]' @@ -223,6 +225,7 @@ if __name__ == '__main__': return [item for sublist in l for item in sublist] # Display approved blockers + # FIXME - automatically display the hotdog if no approved + proposed blockers exist page_content += ''' == Approved Blockers == The following list of bugs are approved blockers that must be resolved. There @@ -244,8 +247,9 @@ bugs, refer to [[QA:SOP_blocker_bug_process]]. # Display approved nths page_content += ''' == Approved NICE-TO-HAVE == -The following list of bugs are approved nths that must be resolved. There are -%s bug(s) affecting %s component(s). +The following list of of bugs are approved nice-to-have. Fixes for +nice-to-have bugs will be accepted during the freeze. There are %s bug(s) +affecting %s component(s). ''' % (len(join_lists(accepted_nth_by_component.values())), len(accepted_nth_by_component)) # Sorted list of approved bugs @@ -254,9 +258,10 @@ The following list of bugs are approved nths that must be resolved. There are # Display proposed nths page_content += ''' == Proposed NICE-TO-HAVE == -The following list of bugs are not yet approved to block the release. There -are %s bug(s) affecting %s component(s). For guidance on reviewing the following -bugs, refer to [[QA:SOP_nth_bug_process]]. +The following list of bugs are not yet approved nice-to-have issues. Only +fixes for approved nice-to-have bugs will be accepted during the freeze. There +are %s bug(s) affecting %s component(s). For guidance on reviewing the +following bugs, refer to [[QA:SOP_nth_bug_process]]. ''' % (len(join_lists(proposed_nth_by_component.values())), len(proposed_nth_by_component)) # Sorted list of proposed bugs -- cgit