need a qdir, the dirnames are different to queuenames

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

diff --git a/config/debian/common b/config/debian/common
index a785db5824780f2dd80d612b529e19de77ae29c7..a2f2877a14932713145539cc2a148e4233638ae0 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -80,13 +80,14 @@ function make_buildd_dir () {
 # Process (oldstable)-proposed-updates "NEW" queue
 function punew_do() {
     local queue="$1"
+    local qdir="$2"
     date -u -R >> REPORT
     dak process-policy "${queue}" | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in ${queue}" debian-release@lists.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
     echo >> REPORT
 
     dak generate-packages-sources2 -s "${queue}"
 
-    local exportdir="${queuedir}/${queue}/export"
+    local exportdir="${queuedir}/${qdir}/export"
     rm -rf "${exportdir}"
     dak export -q "${queue}" -d "${exportdir}" --all
 }
@@ -97,7 +98,7 @@ function punew() {
         log "Doing automated p-u-new processing"
     fi
     cd "${queuedir}/p-u-new"
-    punew_do "$1"
+    punew_do "$1" "p-u-new"
 }
 
 function opunew() {
@@ -105,7 +106,7 @@ function opunew() {
         log "Doing automated o-p-u-new processing"
     fi
     cd "${queuedir}/o-p-u-new"
-    punew_do "$1"
+    punew_do "$1" "o-p-u-new"
 }
 
 # Do the unchecked processing, in case we have files.