X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fbinary.py;h=0a27f95ed7be821d9ec183b0d77a01fd0e13ba9d;hb=ad8a4f45a25d0a39f4200aff166263276247ac3e;hp=92727951cb63a5f93b84af238ee740635a769304;hpb=ba5e6fded9973ad7d6275133947b73cbce867f9a;p=dak.git diff --git a/daklib/binary.py b/daklib/binary.py index 92727951..0a27f95e 100755 --- a/daklib/binary.py +++ b/daklib/binary.py @@ -264,14 +264,16 @@ def copy_temporary_contents(package, version, archname, deb, reject, session=Non contents stored in pending_content_associations """ - # first see if contents exist: cnf = Config() + privatetrans = False if session is None: session = DBConn().session() + privatetrans = True arch = get_architecture(archname, session=session) + # first see if contents exist: in_pcaq = """SELECT 1 FROM pending_content_associations WHERE package=:package AND version=:version @@ -281,7 +283,7 @@ def copy_temporary_contents(package, version, archname, deb, reject, session=Non 'version': version, 'archid': arch.arch_id} - exists = True + exists = None check = session.execute(in_pcaq, vals) if check.rowcount > 0: @@ -311,6 +313,9 @@ def copy_temporary_contents(package, version, archname, deb, reject, session=Non session.execute(sql, vals) session.commit() + if privatetrans: + session.close() + return exists __all__.append('copy_temporary_contents')