You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/08/18 15:57:59 UTC
svn commit: r1159223 - in /subversion/branches/1.7.x: ./ STATUS
build/generator/gen_make.py
Author: hwright
Date: Thu Aug 18 13:57:59 2011
New Revision: 1159223
URL: http://svn.apache.org/viewvc?rev=1159223&view=rev
Log:
Merge r1148083, r1148094 from trunk:
* r1148083, r1148094
Preload libsvn_auth_gnome_keyring and libsvn_auth_kwallet in locally built
executables.
Justification:
Version mismatch errors would occur during trying to use locally built
executables when a different version of Subversion was installed
in /usr/lib.
Votes:
+1: arfrever, philip
+1: rhuijben (untested, but looks like a safe fix)
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build/generator/gen_make.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 18 13:57:59 2011
@@ -57,4 +57,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,115
8455,1158634
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,115
8421,1158436,1158455,1158634
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1159223&r1=1159222&r2=1159223&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Aug 18 13:57:59 2011
@@ -145,17 +145,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1148083, r1148094
- Preload libsvn_auth_gnome_keyring and libsvn_auth_kwallet in locally built
- executables.
- Justification:
- Version mismatch errors would occur during trying to use locally built
- executables when a different version of Subversion was installed
- in /usr/lib.
- Votes:
- +1: arfrever, philip
- +1: rhuijben (untested, but looks like a safe fix)
-
* r1155160
When serf restarts a web request, start parsing xml where we stopped in the
previous request to avoid xml parse errors on the <?xml.
Modified: subversion/branches/1.7.x/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build/generator/gen_make.py?rev=1159223&r1=1159222&r2=1159223&view=diff
==============================================================================
--- subversion/branches/1.7.x/build/generator/gen_make.py (original)
+++ subversion/branches/1.7.x/build/generator/gen_make.py Thu Aug 18 13:57:59 2011
@@ -531,6 +531,8 @@ DIR=`pwd`
''')
libdep_cache = {}
paths = {}
+ for lib in ('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet'):
+ paths[lib] = self.sections[lib].options.get('path')
for target_ob in install_sources:
if not isinstance(target_ob, gen_base.TargetExe):
continue
@@ -548,7 +550,7 @@ DIR=`pwd`
def _get_all_lib_deps(self, target_name, libdep_cache, paths):
if not target_name in libdep_cache:
- libs = {}
+ libs = set()
path = None
if target_name in self.sections:
section = self.sections[target_name]
@@ -557,11 +559,12 @@ DIR=`pwd`
if opt_libs:
for lib_name in opt_libs.split():
if lib_name.startswith('libsvn_'):
- libs[lib_name] = True
+ libs.add(lib_name)
for lib in self._get_all_lib_deps(lib_name, libdep_cache, paths):
- libs[lib] = True
- libdep_cache[target_name] = libs.keys()[:]
- libdep_cache[target_name].sort()
+ libs.add(lib)
+ if target_name == 'libsvn_subr':
+ libs.update(('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet'))
+ libdep_cache[target_name] = sorted(libs)
return libdep_cache[target_name]
class UnknownDependency(Exception):