X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fbyhand-task;h=41f863c581befa127a3957633e7d223cd539ed77;hb=2f03955b56fa89c67a9d45af6543b82adb4b1f41;hp=9fca5f952c21d784611cd3a2edf2375336af72e6;hpb=95c5b50e57dd3410ebd4f0f2a390aeb32e0ac7a5;p=dak.git

diff --git a/scripts/debian/byhand-task b/scripts/debian/byhand-task
index 9fca5f95..41f863c5 100755
--- a/scripts/debian/byhand-task
+++ b/scripts/debian/byhand-task
@@ -1,30 +1,29 @@
-#!/bin/sh -ue
+#!/bin/bash
 
-if [ $# -lt 4 ]; then
-        echo "Usage: $0 filename version arch changes_file"
+set -u
+set -e
+set -o pipefail
+
+if [ $# -lt 5 ]; then
+        echo "Usage: $0 filename version arch changes_file suite"
         exit 1
 fi
 
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 INPUT="$1"      # Tarball to read, compressed with gzip
 VERSION="$2"
 ARCH="$3"
 CHANGES="$4"    # Changes file for the upload
+SUITE="$5"
 
 error() {
         echo "$*"
         exit 1
 }
 
-# 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
-    "")
-        error "Error: unable to determine suite from Changes file"
-        ;;
     unstable|sid)
         : # OK for automated byband processing
         ;;
@@ -38,7 +37,7 @@ esac
 CHECKRE='^[a-z0-9A-Z.+-]+[[:space:]]+Task[[:space:]]+[a-z0-9:. ,{}+-]+$'
 
 # This must end with /
-TARGET=/srv/ftp.debian.org/scripts/external-overrides/
+TARGET=/srv/ftp-master.debian.org/scripts/external-overrides/
 
 # Read the main directory from the tarball
 DIR="`tar ztf \"$INPUT\" | tac | tail -n 1`"
@@ -61,7 +60,8 @@ mv "$OUTMAIN"           "$TARGET"task
 
 chmod 644 "$TARGET"task
 
-(cd $TARGET && $scriptsdir/mk-extra-overrides.sh)
+dak external-overrides import unstable main Task <"$TARGET"task
+dak external-overrides copy unstable testing
 
 trap - EXIT