byhand-code-sign: Put signature tarballs for security uploads in .../updates
authorBen Hutchings <ben@decadent.org.uk>
Mon, 29 Aug 2016 14:10:18 +0000 (15:10 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 24 Sep 2016 23:55:09 +0000 (00:55 +0100)
This is consistent with the Release and Packages files.

scripts/debian/byhand-code-sign

index 6092701..fbd6855 100755 (executable)
@@ -22,13 +22,16 @@ error() {
 
 export OPENSSL_CONF=/dev/null
 
-# Read dak configuration for security or main archive
+# Read dak configuration for security or main archive.
+# Also determine subdirectory for the suite.
 case "$0" in
     /srv/security-master.debian.org/*)
        configdir="/srv/security-master.debian.org/dak/config/debian-security"
+       suitedir="$SUITE/updates"
        ;;
     /srv/ftp-master.debian.org/*)
        configdir="/srv/ftp-master.debian.org/dak/config/debian"
+       suitedir="$SUITE"
        ;;
     *)
        error "$0: Can't tell if security or not"
@@ -44,7 +47,7 @@ for var in EFI_BINARY_PRIVKEY EFI_BINARY_CERT \
        test -n "${!var}" || error "$var is empty in configuration"
 done
 
-TARGET="$ftpdir/dists/$SUITE/main/code-sign/"
+TARGET="$ftpdir/dists/$suitedir/main/code-sign/"
 OUT_TARBALL="$TARGET/${IN_TARBALL##*/}"
 OUT_TARBALL="${OUT_TARBALL%.tar.xz}_sigs.tar.xz"