From: Ansgar Burchardt <ansgar@debian.org>
Date: Mon, 1 Apr 2013 12:16:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1a01a6e33b24a2db5ea7ba52a82d9a03f133dd99;hp=4594a6e250e45dd91ce55b6d199bc07349062cda;p=dak.git

Merge remote-tracking branch 'origin/master'
---

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 07295697..1ced7602 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -385,15 +385,15 @@ function mkfilesindices() {
 }
 
 function mkchecksums() {
-    local archiveroot
+    local archiveroot dsynclist md5list
 
     for archive in "${public_archives[@]}"; do
+        archiveroot="$(get_archiveroot "${archive}")"
         dsynclist=$dbdir/dsync.${archive}.list
-        md5list=$indices/md5sums
+        md5list=${archiveroot}/indices/md5sums
 
         log -n "Creating md5 / dsync index file for ${archive}... "
 
-        archiveroot="$(get_archiveroot "${archive}")"
         cd "$archiveroot"
         ${bindir}/dsync-flist -q generate $dsynclist --exclude $dsynclist --md5
         ${bindir}/dsync-flist -q md5sums $dsynclist | gzip -9n > ${md5list}.gz
diff --git a/daklib/queue.py b/daklib/queue.py
old mode 100644
new mode 100755
index f2dc55a0..8c306267
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -201,7 +201,7 @@ def edit_note(note, upload, session, trainee=False):
 
 # FIXME: Should move into the database
 # suite names DMs can upload to
-dm_suites = ['unstable', 'experimental', 'squeeze-backports']
+dm_suites = ['unstable', 'experimental', 'squeeze-backports','squeeze-backports-sloppy', 'wheezy-backports']
 
 def get_newest_source(source, session):
     'returns the newest DBSource object in dm_suites'