X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=daklib%2Fcontents.py;h=2fb7dfcd35b3e8fcb98bcbf5cf68c28a8d087522;hb=68b730887b6207719256e9fcff548bef3a8cf130;hp=bebab6dd1c9c2a252a62592cda1c97e84738a0e2;hpb=1a4b643db176562f925668b258fa3882634bb759;p=dak.git

diff --git a/daklib/contents.py b/daklib/contents.py
old mode 100755
new mode 100644
index bebab6dd..2fb7dfcd
--- a/daklib/contents.py
+++ b/daklib/contents.py
@@ -65,7 +65,7 @@ class BinaryContentsWriter(object):
             'type':          self.overridetype.overridetype,
         }
 
-        sql = '''
+        sql_create_temp = '''
 create temp table newest_binaries (
     id integer primary key,
     package text);
@@ -77,8 +77,10 @@ insert into newest_binaries (id, package)
         where type = :type and
             (architecture = :arch_all or architecture = :arch) and
             id in (select bin from bin_associations where suite = :suite)
-        order by package, version desc;
+        order by package, version desc;'''
+        self.session.execute(sql_create_temp, params=params)
 
+        sql = '''
 with
 
 unique_override as
@@ -121,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,
@@ -171,7 +174,7 @@ class SourceContentsWriter(object):
             'component_id': self.component.component_id,
         }
 
-        sql = '''
+        sql_create_temp = '''
 create temp table newest_sources (
     id integer primary key,
     source text);
@@ -180,12 +183,13 @@ 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
-        order by source, version desc;
+            and af.component_id = :component_id
+        order by source, version desc;'''
+        self.session.execute(sql_create_temp, params=params)
 
+        sql = '''
 select sc.file, string_agg(s.source, ',' order by s.source) as pkglist
     from newest_sources s, src_contents sc
     where s.id = sc.source_id group by sc.file'''
@@ -219,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
         }
@@ -249,6 +254,7 @@ def binary_helper(suite_id, arch_id, overridetype_id, component_id):
         overridetype.overridetype, component.component_name]
     contents_writer = BinaryContentsWriter(suite, architecture, overridetype, component)
     contents_writer.write_file()
+    session.close()
     return log_message
 
 def source_helper(suite_id, component_id):
@@ -262,6 +268,7 @@ def source_helper(suite_id, component_id):
     log_message = [suite.suite_name, 'source', component.component_name]
     contents_writer = SourceContentsWriter(suite, component)
     contents_writer.write_file()
+    session.close()
     return log_message
 
 class ContentsWriter(object):
@@ -494,6 +501,6 @@ def source_scan_helper(source_id):
     try:
         scanner = SourceContentsScanner(source_id)
         scanner.scan()
-    except Exception, e:
+    except Exception as e:
         print e