summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@debian.org>2020-01-18 22:45:36 -0500
committerJames McCoy <jamessan@debian.org>2020-01-18 22:45:36 -0500
commit8597cd40a6791797fd283eb6954e811d8eb9c00f (patch)
tree1680bfac283ca609705033bee7a35933ffbf7896
parent6196c3e30966fee3f58663eeeaae6d39d306b5c7 (diff)
Commit patch queue (exported by git-debrebase)
[git-debrebase make-patches: export and commit patches]
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/use-python2-as-the-interpreter-now-for-tests-not-python.patch23
2 files changed, 24 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series
index 437319c..1a69b4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ apr-abi
python-builds
examples-compile-instructions
workaround_EINVAL_on_kfreebsd
+use-python2-as-the-interpreter-now-for-tests-not-python.patch
diff --git a/debian/patches/use-python2-as-the-interpreter-now-for-tests-not-python.patch b/debian/patches/use-python2-as-the-interpreter-now-for-tests-not-python.patch
new file mode 100644
index 0000000..e071826
--- /dev/null
+++ b/debian/patches/use-python2-as-the-interpreter-now-for-tests-not-python.patch
@@ -0,0 +1,23 @@
+From: Steve Langasek <steve.langasek@canonical.com>
+Date: Sun, 12 Jan 2020 23:25:01 -0800
+Subject: 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.
+
+Closes: #948770
+Signed-off-by: James McCoy <jamessan@debian.org>
+---
+ subversion/tests/cmdline/svneditor.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/subversion/tests/cmdline/svneditor.py b/subversion/tests/cmdline/svneditor.py
+index 7f59987..375fc07 100755
+--- a/subversion/tests/cmdline/svneditor.py
++++ b/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
+ #