Merge remote-tracking branch 'lamby/improve-parse-changes-tests-796787' into merge

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

diff --git a/scripts/debian/import_dataset.sh b/scripts/debian/import_dataset.sh
index 48e957907278e3f908cf856b146e931403b2c4da..a8acb4993e219249ec63d503f83afed95fda0d99 100755 (executable)
--- a/scripts/debian/import_dataset.sh
+++ b/scripts/debian/import_dataset.sh
@@ -43,6 +43,16 @@ case "${IMPORTSUITE}" in
         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"
+        ;;
     *)
         echo "You are so wrong here that I can't even believe it. Sod off."
         exit 42
@@ -59,7 +69,7 @@ if [ "x${DO_CHANGELOG}x" = "xtruex" ]; then
     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,8 +79,8 @@ 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-sources -s ${IMPORTSUITE} >/dev/null
+#echo "Regenerating Packages/Sources files, be patient"
+#dak generate-packages-sources2 -s ${IMPORTSUITE} >/dev/null
 
 echo "Done"