X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fimport_dataset.sh;h=24ab88edb0ca54993467655046f25a6801047769;hb=7066337f607d0b8e116557a94ab2d4978094f2be;hp=6a8f1292fbf5ac29806c1e4eaceb9dc01f53c36b;hpb=2390f8671de9de6449d21269b112c37b95c3dcbb;p=dak.git

diff --git a/scripts/debian/import_dataset.sh b/scripts/debian/import_dataset.sh
index 6a8f1292..24ab88ed 100755
--- a/scripts/debian/import_dataset.sh
+++ b/scripts/debian/import_dataset.sh
@@ -38,9 +38,14 @@ 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"
+        ;;
+    wheezy-updates)
+        # What file we look at.
+        INPUTFILE="/srv/release.debian.org/sets/wheezy-updates/current"
         DO_CHANGELOG="false"
         ;;
     *)
@@ -52,14 +57,14 @@ esac
 # Change to a known safe location
 cd $masterdir
 
-echo "Importing new data for ${INPUTSUITE} into database"
+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
 
-cat ${INPUTFILE} | dak control-suite --set ${INPUTSUITE} ${BRITNEY}
+dak control-suite --set ${IMPORTSUITE} ${BRITNEY} < ${INPUTFILE}
 
 if [ "x${DO_CHANGELOG}x" = "xtruex" ]; then
     NOW=$(date "+%Y%m%d%H%M")
@@ -69,6 +74,9 @@ if [ "x${DO_CHANGELOG}x" = "xtruex" ]; then
     find . -maxdepth 1 -mindepth 1 -type f -mmin +2880 -name 'ChangeLog.*' -delete
 fi
 
+#echo "Regenerating Packages/Sources files, be patient"
+#dak generate-packages-sources2 -s ${IMPORTSUITE} >/dev/null
+
 echo "Done"
 
 exit 0