X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fimport_dataset.sh;h=a8acb4993e219249ec63d503f83afed95fda0d99;hb=9d77b10ef77da44cf458cc808c323c253b9b8c80;hp=d4e1fb74be809d37ff0066fdcec5d136a5a5752f;hpb=8914e2b474a44ae50b3b55c5c93d575c25a4d625;p=dak.git

diff --git a/scripts/debian/import_dataset.sh b/scripts/debian/import_dataset.sh
index d4e1fb74..a8acb499 100755
--- a/scripts/debian/import_dataset.sh
+++ b/scripts/debian/import_dataset.sh
@@ -38,9 +38,19 @@ 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"
+        ;;
+    jessie-updates)
+        # What file we look at.
+        INPUTFILE="/srv/release.debian.org/sets/jessie-updates/current"
         DO_CHANGELOG="false"
         ;;
     *)
@@ -55,11 +65,11 @@ 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
 
-cat ${INPUTFILE} | dak control-suite --set ${IMPORTSUITE} ${BRITNEY}
+dak control-suite --set ${IMPORTSUITE} ${BRITNEY} < ${INPUTFILE}
 
 if [ "x${DO_CHANGELOG}x" = "xtruex" ]; then
     NOW=$(date "+%Y%m%d%H%M")
@@ -69,6 +79,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