X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fcontents.py;h=2fb7dfcd35b3e8fcb98bcbf5cf68c28a8d087522;hb=8cb8aa7d4e0a3a82f68398a88f12bd89056bba96;hp=e9517d637ec9588d89af9a362ecd14626f9a0d53;hpb=5401a178a83c927e507b746979aab7ee17ffae84;p=dak.git

diff --git a/daklib/contents.py b/daklib/contents.py
old mode 100755
new mode 100644
index e9517d63..2fb7dfcd
--- a/daklib/contents.py
+++ b/daklib/contents.py
@@ -123,6 +123,7 @@ select bc.file, string_agg(o.section || '/' || b.package, ',' order by b.package
         Returns a writer object.
         '''
         values = {
+            'archive':      self.suite.archive.path,
             'suite':        self.suite.suite_name,
             'component':    self.component.component_name,
             'debtype':      self.overridetype.overridetype,
@@ -182,10 +183,9 @@ create index sources_binaries_by_source on newest_sources (source);
 
 insert into newest_sources (id, source)
     select distinct on (source) s.id, s.source from source s
-        join files f on f.id = s.file
-        join location l on l.id = f.location
+        join files_archive_map af on s.file = af.file_id
         where s.id in (select source from src_associations where suite = :suite_id)
-            and l.component = :component_id
+            and af.component_id = :component_id
         order by source, version desc;'''
         self.session.execute(sql_create_temp, params=params)
 
@@ -223,6 +223,7 @@ select sc.file, string_agg(s.source, ',' order by s.source) as pkglist
         Returns a writer object.
         '''
         values = {
+            'archive':   self.suite.archive.path,
             'suite':     self.suite.suite_name,
             'component': self.component.component_name
         }