[reprozip] 02/03: Fix FTBFS with Python 3.6

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Mon May 15 08:46:32 UTC 2017


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository reprozip.

commit 1007b67a4f1b7d62f058625ba46c0009f7fce79f
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Mon May 15 09:39:10 2017 +0100

    Fix FTBFS with Python 3.6
    
    - New patch Commit-sqlite3-transactions-explicitly.patch
    
    Gbp-Dch: full
    Thanks: James Clarke for the patch
    Closes: #862595
---
 .../Commit-sqlite3-transactions-explicitly.patch   | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/Commit-sqlite3-transactions-explicitly.patch b/debian/patches/Commit-sqlite3-transactions-explicitly.patch
new file mode 100644
index 0000000..15d51e2
--- /dev/null
+++ b/debian/patches/Commit-sqlite3-transactions-explicitly.patch
@@ -0,0 +1,33 @@
+From: James Clarke <jrtc27 at debian.org>
+Date: Mon, 15 May 2017 09:35:03 +0100
+Subject: Commit sqlite3 transactions explicitly
+
+---
+ reprozip/traceutils.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/reprozip/traceutils.py b/reprozip/traceutils.py
+index 3204b16..6e5dce1 100644
+--- a/reprozip/traceutils.py
++++ b/reprozip/traceutils.py
+@@ -230,12 +230,20 @@ def combine_traces(traces, target):
+             DELETE FROM maps.map_processes;
+             ''')
+ 
++        # An implicit transaction gets created. Python used to implicitly
++        # commit it, but no longer does as of 3.6, so we have to explicitly
++        # commit before detaching.
++        conn.commit()
++
+         # Detach
+         conn.execute(
+             '''
+             DETACH DATABASE trace;
+             ''')
+ 
++    # See above.
++    conn.commit()
++
+     conn.execute(
+         '''
+         DETACH DATABASE maps;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2df3cff
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Commit-sqlite3-transactions-explicitly.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/reprozip.git



More information about the debian-science-commits mailing list