Merge lp:~rbalint/britney/britney1-list-update-excuse-bugs into lp:~ubuntu-release/britney/britney1-ubuntu

[Balint Reczey]

[lp:~rbalint/britney/britney1-list-update-excuse-bugs]

327. By Balint Reczey on 2019-09-17

List bugs tagged as update-excuse(-<release>) in ExcuseBugs

LP: #1683749

[Adam Conrad (adconrad)]

Looks sane enough.

review: Approve

=== modified file 'britney'
--- britney	2019-08-29 12:27:02 +0000
+++ britney	2019-09-17 09:29:41 +0000
@@ -170,14 +170,24 @@
   bugs $DATA_B2
 fi
 
+excuse_bugs() {
+  tagged_bugs $1 update-excuse ExcuseBugs
+}
+
 blocks () {
-  local tags
+  tagged_bugs $1 block-proposed Blocks
+}
+
+tagged_bugs () {
+  local tag_template tags output_file
+  tag_template=$2
+  output_file=$3
   [ "$DISTRIBUTION" = ubuntu ] || return 0
   mkdir -p "$1/$SERIES-proposed"
   if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
-    tags="block-proposed block-proposed-$SERIES"
+    tags="$tag_template $tag_template-$SERIES"
   else
-    tags="block-proposed-$SERIES"
+    tags="$tag_template-$SERIES"
   fi
   python -c '
 from __future__ import print_function
@@ -229,13 +239,17 @@
         print("%s %d %d" %
               (os.path.basename(target.self_link), bug.id,
                calendar.timegm(date.timetuple())))
-' "$LP_SERVICE" "$DISTRIBUTION" "$tags" >"$1/$SERIES-proposed/Blocks.new"
-  mv "$1/$SERIES-proposed/Blocks.new" "$1/$SERIES-proposed/Blocks"
+' "$LP_SERVICE" "$DISTRIBUTION" "$tags" >"$1/$SERIES-proposed/$output_file.new"
+  mv "$1/$SERIES-proposed/$output_file.new" "$1/$SERIES-proposed/$output_file"
 }
 if option blocks; then
   echo BLOCKS:
   blocks $DATA_B2
 fi
+if option excuse_bugs; then
+  echo EXCUSE BUGS:
+  excuse_bugs $DATA_B2
+fi
 
 pkg_lists () {
   for suite in $SERIES $SERIES-proposed; do
@@ -504,6 +518,7 @@
         rm -f $HTML/$SERIES/update_output_notest.txt
     fi
     cp $DATA_B2/$SERIES-proposed/Blocks $HTML/$SERIES/blocks.txt
+    cp $DATA_B2/$SERIES-proposed/ExcuseBugs $HTML/$SERIES/excuse-bugs.txt || true
   fi
   #gzip -9 < $HTML/$SERIES/update_excuses.html > $HTML/$SERIES/update_excuses.html.gz
   #gzip -9 < $HTML/$SERIES/update_output.txt > $HTML/$SERIES/update_output.txt.gz