make-changelog: fix wrong field name in the SQL query

[dak.git] / dak / make_changelog.py

diff --git a/dak/make_changelog.py b/dak/make_changelog.py
index e0d1710a6909e88b8c1773fdf9a9d943c7820b76..a34d10bd9266da675f428a3c527a587fa95c859b 100755 (executable)
--- a/dak/make_changelog.py
+++ b/dak/make_changelog.py
@@ -67,7 +67,7 @@ def usage (exit_code=0):
 
        Usage:
        make-changelog -s <suite> -b <base_suite> [OPTION]...
-       make-changelog -e
+       make-changelog -e -a <archive>
 
 Options:
 
@@ -76,7 +76,8 @@ Options:
   -b, --base-suite          suite to be taken as reference for comparison
   -n, --binnmu              display binNMUs uploads instead of source ones
 
-  -e, --export              export interesting files from source packages"""
+  -e, --export              export interesting files from source packages
+  -a, --archive             archive to fetch data from"""
 
     sys.exit(exit_code)
 
@@ -170,13 +171,13 @@ def export_files(session, archive, clpool):
     unpack = {}
     files = ('changelog', 'copyright', 'NEWS.Debian', 'README.Debian')
     stats = {'unpack': 0, 'created': 0, 'removed': 0, 'errors': 0, 'files': 0}
-    query = """SELECT DISTINCT s.source, su.suite_name AS suite, s.version, c.name || '/' || f.filename
+    query = """SELECT DISTINCT s.source, su.suite_name AS suite, s.version, c.name || '/' || f.filename AS filename
                FROM source s
                JOIN newest_source n ON n.source = s.source AND n.version = s.version
                JOIN src_associations sa ON sa.source = s.id
                JOIN suite su ON su.id = sa.suite
                JOIN files f ON f.id = s.file
-               JOIN files_archive_map fam ON f.id = fam.file_id AND fam.archive_id = su.id
+               JOIN files_archive_map fam ON f.id = fam.file_id AND fam.archive_id = su.archive_id
                JOIN component c ON fam.component_id = c.id
                WHERE su.archive_id = :archive_id
                ORDER BY s.source, suite"""