X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_policy.py;h=0f2f22aab8a67d93e0d18b8610c1c5e1275f8648;hb=6f863f95e3d1bae18aa5579e958fd8a121b06545;hp=f053a6cfc990317881b9edb986a6b8cb1cad7833;hpb=f5a2bb5206319a10e731075c3db42b52ef486d5e;p=dak.git diff --git a/dak/process_policy.py b/dak/process_policy.py index f053a6cf..0f2f22aa 100755 --- a/dak/process_policy.py +++ b/dak/process_policy.py @@ -37,6 +37,7 @@ import re import sys import traceback import apt_pkg +from sqlalchemy.orm.exc import NoResultFound from daklib.dbconn import * from daklib import daklog @@ -108,6 +109,8 @@ def try_or_reject(function): real_comment_reject(upload, srcqueue, comments, transaction, notify=False) if not Options['No-Action']: transaction.commit() + else: + transaction.rollback() return wrapper ################################################################################ @@ -142,7 +145,7 @@ def comment_accept(upload, srcqueue, comments, transaction): package_list = PackageList(db_source.proxy) component = source_component_from_package_list(package_list, upload.target_suite) if component is not None: - return get_mapped_component(component, session=session) + return get_mapped_component(component.component_name, session=session) # Fallback for packages without Package-List field query = session.query(Override).filter_by(suite=overridesuite, package=db_source.source) \