Merge bileto:fix-hints into bileto:master

[Łukasz Zemczak]

Switch hints from bzr to git, actually handle per-series hints, update hints permissions.

Switch hints from bzr to git, actually handle per-series hints, update hints permissions.

Hints handling in Bileto never really worked. We recently switched from bzr to git, but even before that, the hints never really worked due to two reasons:
1) Outdated hints permissions (REALLY outdated, didn't even have ubuntu-release added)
2) No handling of per-series hints, always used the devel hints

After landing this branch we should have proper per-series hints and everything working as expected. Hopefully.

[Steve Langasek (vorlon)]

Approved with comments.

review: Approve

diff --git a/britney/britney.conf.in b/britney/britney.conf.in
index 02bec2a..a9c2faf 100644
--- a/britney/britney.conf.in
+++ b/britney/britney.conf.in
@@ -45,15 +45,23 @@ MINDAYS_EMERGENCY = 0
 DEFAULT_URGENCY   = medium
 
 # hint permissions
-HINTS_CJWATSON    = ALL
-HINTS_ADCONRAD    = ALL
-HINTS_KITTERMAN   = ALL
-HINTS_LANEY       = ALL
-HINTS_JRIDDELL    = ALL
-HINTS_STEFANOR    = ALL
-HINTS_STGRABER    = ALL
-HINTS_VORLON      = ALL
-HINTS_PITTI       = ALL
+HINTS_ADCONRAD     = ALL
+HINTS_LANEY        = ALL
+HINTS_STEFANOR     = ALL
+HINTS_STGRABER     = ALL
+HINTS_VORLON       = ALL
+HINTS_PITTI        = ALL
+HINTS_UBUNTU-RELEASE = ALL
+# SRU team
+HINTS_APW          = ALL
+HINTS_ARGES        = ALL
+HINTS_BRIAN-MURRAY = ALL
+HINTS_RACB         = ALL
+HINTS_RAOF         = ALL
+HINTS_SIL2100      = ALL
+HINTS_TJAALTON     = ALL
+HINTS_UBUNTU-SRU   = ALL
+HINTS_FREEZE       = block block-all
 
 # support for old libraries in testing (smooth update)
 # use ALL to enable smooth updates for all the sections
diff --git a/britney/fetch-indexes b/britney/fetch-indexes
index 1fa5933..2721513 100755
--- a/britney/fetch-indexes
+++ b/britney/fetch-indexes
@@ -25,6 +25,7 @@ CODEDIR=$(dirname "$(readlink -f "$0")")
 ROOTDIR=$(dirname "$CODEDIR")
 DATADIR=/tmp/britney_data
 OUTDIR=/tmp/britney_output
+# Make sure this one never has a trailing '/', as we add a suffix to it.
 HINTDIR=/tmp/britney_hints
 CACHE=$DATADIR/CACHE
 ARCHIVE=http://archive.ubuntu.com/ubuntu/dists
@@ -62,6 +63,9 @@ refresh() {
 SERIES="$(echo $RAW_SERIES | sed 's/-overlay//')"
 export SERIES
 
+devel_series=$(distro-info --devel)
+HINTSERIES="$(echo $SERIES | sed s/$devel_series/devel/)"
+
 case "$#" in
     2)
         export PPA="$1"
@@ -158,7 +162,7 @@ else
     DEST=$DATADIR/$PPA-$SERIES
     mkdir --parents $DEST "$OUTDIR/$BRITNEY_TIMESTAMP/"
     touch --no-create $DEST
-    loudly ln --verbose --symbolic --force --no-dereference $HINTDIR $DEST/Hints
+    loudly ln --verbose --symbolic --force --no-dereference $HINTDIR-$HINTSERIES $DEST/Hints
     zcat $CACHE/$PPA-$SERIES/*/source/Sources.gz > $DEST/Sources
     for arch in $ARCHES $PORTS_ARCHES; do
         zcat $CACHE/$PPA-$SERIES/*/binary-$arch/Packages.gz > $DEST/Packages_${arch}
diff --git a/scripts/update.sh b/scripts/update.sh
index 1a7c7f5..6024313 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -8,20 +8,28 @@ HINTS="/tmp/britney_hints"
 
 update() {
     [ -d "$1" ] || git init "$1"
-    git -C "$1" fetch --update-head-ok --force "$2" refs/heads/master:refs/heads/master
-    git -C "$1" reset --hard master
+    git -C "$1" fetch --update-head-ok --force "$2" refs/heads/$3:refs/heads/$3
+    git -C "$1" checkout $3
+    git -C "$1" reset --hard $3
 }
 
 set -eux
 
-[ -d "$HINTS" ] || bzr branch lp:~ubuntu-release/britney/hints-ubuntu "$HINTS"
-bzr pull --overwrite --directory "$HINTS"
+# The hints branches migrated from bzr to git.
+[ -d "$HINTS/.bzr" ] && rm -rf $HINTS
+
+# Checkout latest hints for all supported series.
+devel=$(distro-info --devel)
+for series in $(distro-info --supported); do
+    [ "$series" = "$devel" ] && series="devel"
+    update "$HINTS-$series" https://git.launchpad.net/~ubuntu-release/britney/+git/hints-ubuntu "$series"
+done
 
 old_commit="$(git -C "$BILETO" log --max-count 1 --oneline)" || true
-update "$BILETO" "$(cat "$BILETO.branch")"
+update "$BILETO" "$(cat "$BILETO.branch")" "master"
 new_commit="$(git -C "$BILETO" log --max-count 1 --oneline)"
 
-update "$BRITNEY" https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
+update "$BRITNEY" https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu "master"
 
 
 [ "$old_commit" = "$new_commit" ] || $BILETO/scripts/install.sh