svn commit: r1384011 [2/2] - in /subversion/branches/inheritable-props: ./ subversion/include/ subversion/libsvn_fs_fs/ subversion/libsvn_ra_serf/ subversion/libsvn_subr/ subversion/svn/ subversion/svnversion/ subversion/tests/cmdline/ subversion/tests...

[pb...@apache.org]

Modified: subversion/branches/inheritable-props/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/tools/dev/unix-build/Makefile.svn?rev=1384011&r1=1384010&r2=1384011&view=diff
==============================================================================
--- subversion/branches/inheritable-props/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/branches/inheritable-props/tools/dev/unix-build/Makefile.svn Wed Sep 12 16:11:49 2012
@@ -1449,6 +1449,13 @@ svn-check-svn: svn-check-prepare-ramdisk
 svn-check-bindings: svn-check-swig-pl svn-check-swig-py svn-check-swig-rb \
 	svn-check-javahl
 
+# OpenBSD requires an LD_PRELOAD hack to dlopen() libraries linked to
+# libpthread into executables that aren't linked to libpthread.
+ifeq ($(UNAME),OpenBSD)
+LIB_PTHREAD_HACK=LD_PRELOAD=libpthread.so
+endif
+
+
 RUBYLIB=$(SVN_PREFIX)/lib/ruby/site_ruby$(shell grep \
 	^svn_cv_ruby_sitedir_archsuffix $(svn_builddir)/config.log | \
 	cut -d'=' -f2):$(SVN_PREFIX)/lib/ruby/site_ruby$(shell \
@@ -1458,6 +1465,7 @@ svn-check-swig-pl:
 	-if [ $(ENABLE_PERL_BINDINGS) = yes ]; then \
 		(cd $(svn_builddir) && \
 			env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \
+			$(LIB_PTHREAD_HACK) \
 			make check-swig-pl 2>&1) | \
 				tee $(svn_builddir)/tests.log.bindings.pl; \
 	fi
@@ -1475,6 +1483,7 @@ svn-check-swig-rb:
 		env RUBYLIB=$(RUBYLIB) \
 		LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \
 		PATH=$(SVN_PREFIX)/bin:$$PATH \
+		$(LIB_PTHREAD_HACK) \
 			make check-swig-rb 2>&1) | \
 			tee $(svn_builddir)/tests.log.bindings.rb
 

Modified: subversion/branches/inheritable-props/tools/dist/make-deps-tarball.sh
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/tools/dist/make-deps-tarball.sh?rev=1384011&r1=1384010&r2=1384011&view=diff
==============================================================================
--- subversion/branches/inheritable-props/tools/dist/make-deps-tarball.sh (original)
+++ subversion/branches/inheritable-props/tools/dist/make-deps-tarball.sh Wed Sep 12 16:11:49 2012
@@ -21,14 +21,12 @@
 #
 set -e
 
-# NOTE: Before bumping the default APR dependency the 1.6.x test suite
-# should be adjusted to cope with hash ordering changes from APR 1.4.6.
-APR=apr-1.4.5
+APR=apr-1.4.6
 APR_UTIL=apr-util-1.4.1
 NEON=neon-0.29.6
 SERF=serf-0.3.1
-ZLIB=zlib-1.2.6
-SQLITE_VERSION=3071100
+ZLIB=zlib-1.2.7
+SQLITE_VERSION=3071400
 SQLITE=sqlite-amalgamation-$SQLITE_VERSION
 
 HTTPD=httpd-2.2.22

Propchange: subversion/branches/inheritable-props/tools/dist/make-deps-tarball.sh
------------------------------------------------------------------------------
  Merged /subversion/trunk/tools/dist/make-deps-tarball.sh:r1305660-1383997

Modified: subversion/branches/inheritable-props/tools/server-side/svnpubsub/README.txt
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/tools/server-side/svnpubsub/README.txt?rev=1384011&r1=1384010&r2=1384011&view=diff
==============================================================================
--- subversion/branches/inheritable-props/tools/server-side/svnpubsub/README.txt (original)
+++ subversion/branches/inheritable-props/tools/server-side/svnpubsub/README.txt Wed Sep 12 16:11:49 2012
@@ -40,10 +40,3 @@ Installation instructions:
 
    (eg svnwcsub.py, svnpubsub/client.py,
        'curl -i http://${hostname}:2069/commits/json')
-
-
-Other notes:
-
-- svnwcsub.py will create a file called ".revision" in the root of the working
-  copy it updates.  That file will contain
-  `svn info ./ | sed -ne s/^Revision:.//p`.

Modified: subversion/branches/inheritable-props/tools/server-side/svnpubsub/svnwcsub.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/tools/server-side/svnpubsub/svnwcsub.py?rev=1384011&r1=1384010&r2=1384011&view=diff
==============================================================================
--- subversion/branches/inheritable-props/tools/server-side/svnpubsub/svnwcsub.py (original)
+++ subversion/branches/inheritable-props/tools/server-side/svnpubsub/svnwcsub.py Wed Sep 12 16:11:49 2012
@@ -230,7 +230,7 @@ class BackgroundWorker(threading.Thread)
             try:
                 if operation == OP_UPDATE:
                     self._update(wc)
-                if operation == OP_BOOT:
+                elif operation == OP_BOOT:
                     self._update(wc, boot=True)
                 elif operation == OP_CLEANUP:
                     self._cleanup(wc)
@@ -276,18 +276,12 @@ class BackgroundWorker(threading.Thread)
         info = svn_info(self.svnbin, self.env, wc.path)
         logging.info("updated: %s now at r%s", wc.path, info['Revision'])
 
-        ### update the .revision file
-        dotrevision = os.path.join(wc.path, '.revision') 
-        try:
-            os.unlink(dotrevision)
-        except OSError, e:
-            if e.errno != errno.ENOENT:
-                raise
-        open(dotrevision, 'w').write(info['Revision'])
-
         ## Run the hook
         if self.hook:
-            args = [self.hook, ['post-update', 'boot'][boot],
+            hook_mode = ['post-update', 'boot'][boot]
+            logging.info('running hook: %s at revision %s due to %s',
+                         wc.path, info['Revision'], hook_mode)
+            args = [self.hook, hook_mode,
                     wc.path, info['Revision'], wc.url]
             subprocess.check_call(args, env=self.env)