You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2015/03/19 19:23:06 UTC
svn commit: r1667825 - in /subversion/branches/1.9.x: ./ STATUS
subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Author: svn-role
Date: Thu Mar 19 18:23:06 2015
New Revision: 1667825
URL: http://svn.apache.org/r1667825
Log:
Merge r1665164 from trunk:
* r1665164
Fix Python SWIG reference counting in svn_fs_[un]lock_many.
Justification:
Python interpreter may crash.
Votes:
+1: philip, danielsh
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 18:23:06 2015
@@ -89,4 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663450,1663697,1663706,1663749,1664084-1664085
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663450,1663697,1663706,1663749,1664084-1664085,1665164
Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1667825&r1=1667824&r2=1667825&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Mar 19 18:23:06 2015
@@ -178,13 +178,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1665164
- Fix Python SWIG reference counting in svn_fs_[un]lock_many.
- Justification:
- Python interpreter may crash.
- Votes:
- +1: philip, danielsh
-
* r1665611, r1665612
Improve set of versions of httpd with known encoding issues.
Justification:
Modified: subversion/branches/1.9.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1667825&r1=1667824&r2=1667825&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (original)
+++ subversion/branches/1.9.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Thu Mar 19 18:23:06 2015
@@ -464,7 +464,7 @@ static PyObject *make_ob_error(svn_error
if (err)
return svn_swig_NewPointerObjString(err, "svn_error_t *", NULL);
else
- return Py_None;
+ Py_RETURN_NONE;
}