From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 27 May 2016 07:08:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'jcristau/remote-import-dataset'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=29905ba008ec799882f9e00ddc8a8eb16aa7c1a6;hp=f227c91fcba03042d9fe1afb368b6cc0525e510f;p=dak.git

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 e6d6f2fb..b5da4ee9 100644
--- 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 51c4e5d6..dfc2c903 100644
--- 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 7e3f932d..a7e34cba 100644
--- 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 6eb39cac..e03ba3a3 100755
--- 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"
         ;;
     *)