Merge branch 'master' into dbtests

config/debian/dak.conf

@@ -357,6 +357,12 @@ AutomaticByHandPackages {
     Extension "tar.gz";
     Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-task";
   };
+
+  "win32-loader" {
+    Source "win32-loader";
+    Section "byhand";
+    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-win32-loader";
+  };
 };
 
 Dir

scripts/debian/byhand-di

-#!/bin/sh -ue
+#!/bin/sh
+
+set -u
+set -e
 
 if [ $# -lt 4 ]; then
 	echo "Usage: $0 filename version arch changes_file"

scripts/debian/byhand-tag

-#!/bin/sh -ue
+#!/bin/sh
+
+set -u
+set -e
 
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS

scripts/debian/byhand-task

-#!/bin/sh -ue
+#!/bin/sh
+
+set -u
+set -e
 
 if [ $# -lt 4 ]; then
         echo "Usage: $0 filename version arch changes_file"

scripts/debian/byhand-win32-loader

+#!/bin/sh
+
+set -u
+set -e
+
+if [ $# -lt 4 ]; then
+	echo "Usage: $0 filename version arch changes_file"
+	exit 1
+fi
+
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
+. $SCRIPTVARS
+
+WIN32_LOADER_FILE="$1"	# *-win32-loader{.exe,txt}
+VERSION="$2"
+ARCH="$3"
+CHANGES="$4"	# Changes file for the upload
+
+# Get the target suite from the Changes file
+# NOTE: it may be better to pass this to the script as a parameter!
+SUITE="$(grep "^Distribution:" "$CHANGES" | awk '{print $2}')"
+case $SUITE in
+    "")
+	    echo "Error: unable to determine suite from Changes file"
+        exit 1
+	    ;;
+    unstable|sid)
+	    : # nothing to do
+	    ;;
+    *)
+	    SUITE="${SUITE}-proposed-updates"
+	    ;;
+esac
+
+# This must end with /
+TARGET="${ftpdir}/tools/win32-loader/${SUITE}/"
+
+# Check validity of the target directory
+if [ ! -d "$TARGET" ]; then
+	mkdir -p "$TARGET"
+fi
+
+# Put said file into the tools directory
+cp "$WIN32_LOADER_FILE" "$TARGET"
+
+exit 0