From: Ansgar Burchardt Date: Thu, 11 Sep 2014 18:30:18 +0000 (+0200) Subject: dak make-pkg-file-mapping: do not include sources from other archives X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e3a60b6c7b6e68bde4342dfa519116e604e67cd3;p=dak.git dak make-pkg-file-mapping: do not include sources from other archives Include only information about a source package's files if its .dsc is in the requested archive. Previously when xy_1.0-1 was in the requested archive and xy_1.0-2 using the same upstream tarball in a different archive, dak would still include information about xy_1.0-2's upstream tarball resulting in confusing entries on snapshot.d.o. Reported-by: Salvatore Bonaccorso --- diff --git a/dak/make_pkg_file_mapping.py b/dak/make_pkg_file_mapping.py index e92f5674..f52836f8 100755 --- a/dak/make_pkg_file_mapping.py +++ b/dak/make_pkg_file_mapping.py @@ -52,6 +52,7 @@ def build_mapping(archive, session): JOIN files ON files.id=dsc_files.file JOIN files_archive_map ON files.id = files_archive_map.file_id JOIN component ON files_archive_map.component_id = component.id + JOIN files_archive_map fam_dsc ON fam_dsc.file_id=source.file AND fam_dsc.component_id=component.id AND fam_dsc.archive_id=files_archive_map.archive_id WHERE files_archive_map.archive_id = :archive_id ORDER BY source, version, component.id, files.filename """