X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=daklib%2Fcontents.py;h=02abe1f93e3212b11a16816c07eecbdd3cc63b99;hb=d0c59ca05415c09d05d5945f22cc3cd68363fe71;hp=81ce2226774c4766096d0e8ef1ff51f69816be30;hpb=a63127fec222109e25b2a7e75408bbb095c6c443;p=dak.git diff --git a/daklib/contents.py b/daklib/contents.py old mode 100755 new mode 100644 index 81ce2226..02abe1f9 --- 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, @@ -223,6 +224,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 } @@ -253,6 +255,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): @@ -266,6 +269,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):