Merge remote branch 'odyx/win32-loader-autobyhand' into merge

[dak.git] / scripts / debian / import_dataset.sh

diff --git a/scripts/debian/import_dataset.sh b/scripts/debian/import_dataset.sh
index d4e1fb74be809d37ff0066fdcec5d136a5a5752f..183baddd92cd5e2834add8f700efe34ac4efff49 100755 (executable)
--- a/scripts/debian/import_dataset.sh
+++ b/scripts/debian/import_dataset.sh
@@ -38,9 +38,9 @@ case "${IMPORTSUITE}" in
         INPUTFILE="/srv/release.debian.org/britney/Heidi/set/current"
         DO_CHANGELOG="true"
         ;;
-    squeeze-volatile)
+    squeeze-updates)
         # What file we look at.
-        INPUTFILE="/srv/release.debian.org/volatile/set/squeeze-volatile"
+        INPUTFILE="/srv/release.debian.org/sets/squeeze-updates/current"
         DO_CHANGELOG="false"
         ;;
     *)
@@ -55,7 +55,7 @@ cd $masterdir
 echo "Importing new data for ${IMPORTSUITE} into database"
 
 if [ "x${DO_CHANGELOG}x" = "xtruex" ]; then
-    rm ${ftpdir}/dists/${IMPORTSUITE}/ChangeLog
+    rm -f ${ftpdir}/dists/${IMPORTSUITE}/ChangeLog
     BRITNEY=" --britney"
 fi