Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak:
  Walk the right path when suite_suffix is in use

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index a3ed5a4f0b7ecf9742eab71f24239868a62a9ac9..b21f30a5483f11ab5997bb393fbcb603473bd252 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -182,7 +182,7 @@ class ReleaseWriter(object):
             out.write("Description: %s\n" % suite.description)
 
         for comp in components:
-            for dirpath, dirnames, filenames in os.walk("%sdists/%s/%s" % (cnf["Dir::Root"], suite.suite_name, comp), topdown=True):
+            for dirpath, dirnames, filenames in os.walk("%sdists/%s/%s%s" % (cnf["Dir::Root"], suite.suite_name, suite_suffix, comp), topdown=True):
                 if not re_gensubrelease.match(dirpath):
                     continue