X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fcontents.py;h=81ce2226774c4766096d0e8ef1ff51f69816be30;hb=d594c288046f7eff586e0ac3dbc717d5d8b9b998;hp=bebab6dd1c9c2a252a62592cda1c97e84738a0e2;hpb=50db22ea5f288daa39f81138a41a509d9a41cc3e;p=dak.git diff --git a/daklib/contents.py b/daklib/contents.py index bebab6dd..81ce2226 100755 --- 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 @@ -171,7 +173,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); @@ -184,8 +186,10 @@ insert into newest_sources (id, source) join location l on l.id = f.location where s.id in (select source from src_associations where suite = :suite_id) and l.component = :component_id - order by source, version desc; + 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''' @@ -494,6 +498,6 @@ def source_scan_helper(source_id): try: scanner = SourceContentsScanner(source_id) scanner.scan() - except Exception, e: + except Exception as e: print e