Author: svn-role Date: Fri Jan 5 04:00:06 2018 New Revision: 1820247 URL: http://svn.apache.org/viewvc?rev=1820247&view=rev Log: Merge r1819444 from trunk:
* r1819444 autogen.sh: Correct the symbolic error name generation logic under Python 3. Justification: Fixes a false positive warning in autogen.sh under Python 3. Trivial fix. Votes: +1: danielsh, jamessan, stefan2 Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/build/generator/gen_base.py Propchange: subversion/branches/1.10.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 5 04:00:06 2018 @@ -99,4 +99,4 @@ /subversion/branches/verify-at-commit:1462039-1462408 /subversion/branches/verify-keep-going:1439280-1546110 /subversion/branches/wc-collate-path:1402685-1480384 -/subversion/trunk:1817837,1817856,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819093,1819162,1819603,1819911 +/subversion/trunk:1817837,1817856,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819093,1819162,1819444,1819603,1819911 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1820247&r1=1820246&r2=1820247&view=diff ============================================================================== --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Jan 5 04:00:06 2018 @@ -29,13 +29,6 @@ Veto-blocked changes: Approved changes: ================= - * r1819444 - autogen.sh: Correct the symbolic error name generation logic under Python 3. - Justification: - Fixes a false positive warning in autogen.sh under Python 3. Trivial fix. - Votes: - +1: danielsh, jamessan, stefan2 - * r1819556, r1819557 Improve external command invocation in the swig parts of the build system. Both gen-make.py and 'make swig-py' are affected. Modified: subversion/branches/1.10.x/build/generator/gen_base.py URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/build/generator/gen_base.py?rev=1820247&r1=1820246&r2=1820247&view=diff ============================================================================== --- subversion/branches/1.10.x/build/generator/gen_base.py (original) +++ subversion/branches/1.10.x/build/generator/gen_base.py Fri Jan 5 04:00:06 2018 @@ -331,7 +331,8 @@ class GeneratorBase: '\n'.join(lines)) def errno_filter(self, codes): - return codes + # list() to force the generator under python3 + return list(codes) class FileSectionOptionEnum(object): # These are accessed via getattr() later on