Merge remote-tracking branch 'jcristau/remote-import-dataset'

* jcristau/remote-import-dataset:
  Make release_team_removals.sh take input from stdin

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/scripts/debian/release_team_removals.sh b/scripts/debian/release_team_removals.sh
index 82e4e72638b7e22fb44520fc34ffaff2cfe49db0..3e06755f781265961c73f7535462f7b1a39432b7 100755 (executable)
--- a/scripts/debian/release_team_removals.sh
+++ b/scripts/debian/release_team_removals.sh
@@ -30,26 +30,23 @@ set -u
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
-SUITE="testing-proposed-updates"
-IMPORTDIR="/srv/release.debian.org/sets/tpu-removals"
-IMPORTFILE="${IMPORTDIR}/current"
+tempfile=$(mktemp)
+trap "rm -f ${tempfile}" EXIT
 
-if [ ! -e "${IMPORTFILE}" ]; then
-    echo "${IMPORTFILE} not found"
+cat > ${tempfile}
+expected_checksum="${SSH_ORIGINAL_COMMAND}"
+if ! echo "${expected_checksum} ${tempfile}" | md5sum --check --quiet; then
     exit 1
 fi
 
 # Change to a known safe location
 cd $masterdir
 
-echo "Performing cleanup on ${SUITE}"
+SUITE="testing-proposed-updates"
 
-dak control-suite --remove ${SUITE} < ${IMPORTFILE}
+echo "Performing cleanup on ${SUITE}"
 
-if [ $? -eq 0 ]; then
-    NOW=$(date "+%Y%m%d%H%M")
-    mv "${IMPORTFILE}" "${IMPORTDIR}/processed.${NOW}"
-fi
+dak control-suite --remove ${SUITE} < ${tempfile}
 
 echo "Done"