Package: subversion
Version: 1.13.0-1
Severity: serious
Tags: patch
Justification: FTBFS
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi James,

With the impending removal of /usr/bin/python and the python package in
favor of /usr/bin/python2 (shipped by 'python2'), subversion will start to
fail to build due to trying to invoke /usr/bin/env python in the testsuite.

The attached patch fixes the build failure in Ubuntu, where python-all-dev
has already transitioned to depend on python2 instead of on python.

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru subversion-1.13.0/debian/patches/python2-in-tests.patch 
subversion-1.13.0/debian/patches/python2-in-tests.patch
--- subversion-1.13.0/debian/patches/python2-in-tests.patch     1969-12-31 
16:00:00.000000000 -0800
+++ subversion-1.13.0/debian/patches/python2-in-tests.patch     2020-01-12 
23:25:01.000000000 -0800
@@ -0,0 +1,16 @@
+Description: use python2 as the interpreter now for tests, not python
+ /usr/bin/python is no longer guaranteed to exist, per PEP 394.  Use python2
+ instead for compatibility.
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Last-Updated: 2020-01-12
+
+Index: subversion-1.13.0/subversion/tests/cmdline/svneditor.py
+===================================================================
+--- subversion-1.13.0.orig/subversion/tests/cmdline/svneditor.py
++++ subversion-1.13.0/subversion/tests/cmdline/svneditor.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #
+ #  svneditor.py: a mock $SVN_EDITOR for the Subversion test suite
+ #
diff -Nru subversion-1.13.0/debian/patches/series 
subversion-1.13.0/debian/patches/series
--- subversion-1.13.0/debian/patches/series     2019-11-28 19:11:05.000000000 
-0800
+++ subversion-1.13.0/debian/patches/series     2020-01-12 23:21:41.000000000 
-0800
@@ -10,3 +10,4 @@
 python-builds
 examples-compile-instructions
 workaround_EINVAL_on_kfreebsd
+python2-in-tests.patch

Reply via email to