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

* jcristau/remote-import-dataset:
  Fix syntax error in import_dataset.sh
  Move urgency log from release.d.o to our web dir

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

diff --git a/config/debian/daily.functions b/config/debian/daily.functions
index e6d6f2fb9da1cc3abed67ded9cfc62b3287c07aa..b5da4ee96e45fa092666043fef355b4f210af420 100644 (file)
--- a/config/debian/daily.functions
+++ b/config/debian/daily.functions
@@ -58,3 +58,9 @@ function contributor() {
     log "----"
     rm -f ${TMPCNTB}.result
 }
+
+# Clean up urgency log
+function cleanurgencylog() {
+    log "Cleaning up urgency log"
+    find /srv/ftp.debian.org/web/britney/urgencies -type -f -mtime +365 -delete
+}

diff --git a/config/debian/daily.tasks b/config/debian/daily.tasks
index 51c4e5d66f9cc162e7d36b87080a6342c092b495..dfc2c903593dfc0ce07796ce7057f205f6b7ed1c 100644 (file)
--- a/config/debian/daily.tasks
+++ b/config/debian/daily.tasks
@@ -7,3 +7,4 @@ clean_debbugs          none                       none                       fal
 overridedisp           none                       none                       false   false
 newstats               none                       none                       false   false
 contributor            none                       none                       false   false
+cleanurgencylog        none                       none                       false   false

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7e3f932d658ae55a900f995db4ce52cb31d1031f..a7e34cba14ff6a7b343a76a0e28bf2c2f9544dcf 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -218,7 +218,7 @@ Dir
   Lock "/srv/ftp-master.debian.org/lock";
   Morgue "/srv/ftp-master.debian.org/morgue/";
   Override "/srv/ftp-master.debian.org/scripts/override/";
-  UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
+  UrgencyLog "/srv/ftp.debian.org/web/britney/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";
   BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
   Done "/srv/ftp-master.debian.org/queue/done/";

diff --git a/scripts/debian/import_dataset.sh b/scripts/debian/import_dataset.sh
index 6eb39cacda49ec5c1ad7c8bd9f2fd0b860523f3b..e03ba3a36f1e0f4744c9203ca17d705e921869db 100755 (executable)
--- a/scripts/debian/import_dataset.sh
+++ b/scripts/debian/import_dataset.sh
@@ -37,10 +37,7 @@ case "${IMPORTSUITE}" in
     testing)
         DO_CHANGELOG="true"
         ;;
-    testing-debug)
-    squeeze-updates)
-    wheezy-updates)
-    jessie-updates)
+    testing-debug|squeeze-updates|wheezy-updates|jessie-updates)
         DO_CHANGELOG="false"
         ;;
     *)