Merge remote-tracking branch 'drkranz/lintian' into merge

[dak.git] / scripts / debian / byhand-task

diff --git a/scripts/debian/byhand-task b/scripts/debian/byhand-task
index 8caf9422eafbeb2fa2e37ffde04d509e1c01ccf8..ee0c55144631db7a059ad337d105a482c26ab278 100755 (executable)
--- a/scripts/debian/byhand-task
+++ b/scripts/debian/byhand-task
@@ -1,10 +1,16 @@
-#!/bin/sh -ue
+#!/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
+
 INPUT="$1"      # Tarball to read, compressed with gzip
 VERSION="$2"
 ARCH="$3"
@@ -35,7 +41,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`"
@@ -58,7 +64,9 @@ mv "$OUTMAIN"           "$TARGET"task
 
 chmod 644 "$TARGET"task
 
-(cd $TARGET && ./mk-extra-overrides.sh)
+(cd $TARGET && $scriptsdir/mk-extra-overrides.sh)
+dak external-overrides import unstable main Task <"$TARGET"task
+dak external-overrides copy unstable testing
 
 trap - EXIT