X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fimport.py;h=36d965eeeeba0cf784109a34c587463de772d9c0;hb=6f863f95e3d1bae18aa5579e958fd8a121b06545;hp=c9722933d55d56583cc3cb1fed7d73cb54f10791;hpb=e53c31af21851ed263e8252da6ffedcf3886bea6;p=dak.git diff --git a/dak/import.py b/dak/import.py index c9722933..36d965ee 100644 --- a/dak/import.py +++ b/dak/import.py @@ -76,13 +76,13 @@ def import_source(log, transaction, suite, component, directory, hashed_file, section_name = 'misc' if component.component_name != 'main': section_name = "{0}/{1}".format(component.component_name, section_name) - section = session.query(Section).filter_by(section=section).one() + section = session.query(Section).filter_by(section=section_name).one() priority = session.query(Priority).filter_by(priority='extra').one() - override = Override(package=control.dsc['Source'], suite=overridesuite, component=component, + override = Override(package=source.dsc['Source'], suite=overridesuite, component=component, section=section, priority=priority, overridetype=overridetype) session.add(override) - log.log(['add-source-override', suite.suite_name, component.component_name, control.dsc['Source'], section.section, priority.priority]) + log.log(['add-source-override', suite.suite_name, component.component_name, source.dsc['Source'], section.section, priority.priority]) def import_binary(log, transaction, suite, component, directory, hashed_file, fingerprint=None, add_overrides=False): filename = hashed_file.filename @@ -139,6 +139,8 @@ def import_dump(log, transaction, suite, component, fh, fingerprint=fingerprint, changed_by=changed_by, keyrings=keyrings, require_signature=require_signature, add_overrides=add_overrides) + transaction.commit() + _export_query = r""" WITH tmp AS