You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2019/10/24 15:18:41 UTC
svn commit: r1868880 - in /subversion/branches/1.13.x: ./ STATUS
subversion/tests/cmdline/svnserveautocheck.sh
Author: julianfoad
Date: Thu Oct 24 15:18:40 2019
New Revision: 1868880
URL: http://svn.apache.org/viewvc?rev=1868880&view=rev
Log:
Merge r1868151 from trunk:
* r1868151
Fix syntax error when $PYTHON is Python 3.
Justification:
Python 2 will reach EOL during the lifetime of this branch.
Votes:
+1: danielsh
+0: julianfoad (reviewed only)
Modified:
subversion/branches/1.13.x/ (props changed)
subversion/branches/1.13.x/STATUS
subversion/branches/1.13.x/subversion/tests/cmdline/svnserveautocheck.sh
Propchange: subversion/branches/1.13.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1868151
Modified: subversion/branches/1.13.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.13.x/STATUS?rev=1868880&r1=1868879&r2=1868880&view=diff
==============================================================================
--- subversion/branches/1.13.x/STATUS (original)
+++ subversion/branches/1.13.x/STATUS Thu Oct 24 15:18:40 2019
@@ -23,14 +23,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1868151
- Fix syntax error when $PYTHON is Python 3.
- Justification:
- Python 2 will reach EOL during the lifetime of this branch.
- Votes:
- +1: danielsh
- +0: julianfoad (reviewed only)
-
* r1868575
Fix false positive on test with Python 3
Justification:
Modified: subversion/branches/1.13.x/subversion/tests/cmdline/svnserveautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.13.x/subversion/tests/cmdline/svnserveautocheck.sh?rev=1868880&r1=1868879&r2=1868880&view=diff
==============================================================================
--- subversion/branches/1.13.x/subversion/tests/cmdline/svnserveautocheck.sh (original)
+++ subversion/branches/1.13.x/subversion/tests/cmdline/svnserveautocheck.sh Thu Oct 24 15:18:40 2019
@@ -134,7 +134,7 @@ random_port() {
if [ -n "$BASH_VERSION" ]; then
echo $(($RANDOM+1024))
else
- $PYTHON -c 'import random; print random.randint(1024, 2**16-1)'
+ $PYTHON -c 'import random; print(random.randint(1024, 2**16-1))'
fi
}