Merge remote-tracking branch 'alteholz/alteholz/bugfix/tracker' into merge

This (closes: 754805)
* alteholz/alteholz/bugfix/tracker:
  fix for #754805

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index ba9474e5da3c537931130159a52b5e42496359ab..87f444ab866898b775c9d80862b8ca72cea3b9f5 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -130,6 +130,8 @@ SuiteMappings
   "silent-map squeeze-security oldstable";
   "silent-map wheezy-security stable";
   "silent-map jessie-security testing";
+
+  "reject oldstable";
 };
 
 Dir

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 780b70210c98e10bdaa55543ed263bd710d7f0e5..8c5c1fb54af164905e97fbac0f97c635e471399b 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -151,6 +151,7 @@ SuiteMappings
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
 
+ "reject oldstable-proposed-updates";
  "reject jessie-backports";
  "reject jessie-updates";
 };

diff --git a/config/homedir/.bashrc b/config/homedir/.bashrc
index 23e16b5ab684d8ad584688b7dc82dcbb9b6dafa1..4d34e5a0583dd6c6d02aece0ac2ce5188d38e48b 100644 (file)
--- a/config/homedir/.bashrc
+++ b/config/homedir/.bashrc
@@ -28,12 +28,9 @@ xterm*|rxvt*)
 esac
 
 case "$HOSTNAME" in
-    franck)
+    franck|coccia)
         export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
         ;;
-    morricone)
-        export SCRIPTVARS=/srv/backports-master.debian.org/dak/config/backports/vars
-        ;;
     chopin)
         export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/vars
         ;;
@@ -42,7 +39,9 @@ case "$HOSTNAME" in
         ;;
 esac
 
-. $SCRIPTVARS
+if [[ -n ${SCRIPTVARS} ]]; then
+    . $SCRIPTVARS
+fi
 
 function em() {
     export EDITOR=$(which emacs)

diff --git a/scripts/debian/moveftp.sh b/scripts/debian/moveftp.sh
index 6aecc289dbc077126d1335e8a273a40c2c246cf2..816febc6188329a3a2051917b327664b30e7a266 100755 (executable)
--- a/scripts/debian/moveftp.sh
+++ b/scripts/debian/moveftp.sh
@@ -3,7 +3,7 @@
 set -e
 set -u
 
-FTPDIR="/org/upload.debian.org/ftp/pub/UploadQueue/"
-SSHDIR="/org/upload.debian.org/UploadQueue/"
+FTPDIR="/srv/upload.debian.org/ftp/pub/UploadQueue/"
+SSHDIR="/srv/upload.debian.org/UploadQueue/"
 
 yes n | find ${FTPDIR} -type f -mmin +15 -print0 -exec mv -i --target-directory=${SSHDIR} "{}" +