Merge lp:~cjwatson/ubuntu-archive-publishing/inline-release into lp:ubuntu-archive-publishing

[Colin Watson]

Add clearsigned InRelease files for archives.

Add clearsigned InRelease files for archives.

This only applies to the primary archive; PPAs and partner are already done, or will be once they get new publications. I believe I've made sure that all the relevant mirroring scripts and other infrastructure will cope with this.

[lp:~cjwatson/ubuntu-archive-publishing/inline-release]

73. By Colin Watson on 2015-10-07

Clarify log message.

[Colin Watson (cjwatson)]

00:24 <infinity> cjwatson: Looks reasonable, though "(re-)signing $CANDIDATE inline" seems a little harder to parse than just "(re-)signing $INRELEASE" would be, no?
00:24 <infinity> cjwatson: All looks logically sane, though.

I've fixed that and will take that as an approve vote from Adam.

review: Approve

=== modified file 'publish-distro.d/10-sign-releases'
--- publish-distro.d/10-sign-releases	2015-09-26 01:01:27 +0000
+++ publish-distro.d/10-sign-releases	2015-10-07 09:59:07 +0000
@@ -86,3 +86,15 @@
         touch --reference "$CANDIDATE" "$CANDIDATE.gpg"
     fi
 done
+
+for CANDIDATE in $RELEASE_FILES
+do
+    INRELEASE="${CANDIDATE%/Release}/InRelease"
+    if [ ! -f "$INRELEASE" ] || [ "$CANDIDATE" -nt "$INRELEASE" ]; then
+        opts="$(gpg_opts "$CANDIDATE")"
+        echo "$(date -R): (re-)signing $INRELEASE ($opts)"
+        gpg --yes --clearsign --armor -o "$INRELEASE" \
+            --no-permission-warning $opts "$CANDIDATE"
+        touch --reference "$CANDIDATE" "$INRELEASE"
+    fi
+done