Merge remote-tracking branch 'drkranz/fixes' into merge

* drkranz/fixes:
  Fix glob regex, which generated wrong filenames
  Fix indentation

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 295fbb7ffc67623268e8d99b85a702ee57e746b8..634554057f930e79804a52eda55d370fa7c6bd54 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -627,9 +627,9 @@ function changelogs() {
         mkdir -p /srv/backports-master.debian.org/rsync/export/changelogs
         cd /srv/backports-master.debian.org/rsync/export/changelogs
         rsync -aHW --delete --delete-after --ignore-errors /srv/backports-master.debian.org/export/changelogs/. .
+        remove_changelog_lock
         trap remove_changelog_lock EXIT TERM HUP INT QUIT
     fi
-    remove_changelog_lock
 }
 
 function gitpdiff() {

diff --git a/dak/make_changelog.py b/dak/make_changelog.py
index 1f1b1ca3c46ec0b31fc866bcb89217d79d9b1b56..7d3132eb28a42260847fc6919716a556d3562028 100755 (executable)
--- a/dak/make_changelog.py
+++ b/dak/make_changelog.py
@@ -201,7 +201,7 @@ def export_files(session, archive, clpool, progress=False):
                     unpack[os.path.join(pool, sources[p][s][1])] = (path, set())
                 unpack[os.path.join(pool, sources[p][s][1])][1].add(s)
             else:
-                for file in glob('%s/%s_%s*' % (path, p, sources[p][s][0])):
+                for file in glob('%s/%s_%s_*' % (path, p, sources[p][s][0])):
                     link = '%s%s' % (s, file.split('%s_%s' \
                                       % (p, sources[p][s][0]))[1])
                     try: