From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 16 Nov 2012 15:29:37 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.2-alpha~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efb644ed87cad093f2b1407bc13648e092367cdc;p=libevent

Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
	test/rpcgen_wrapper.sh
---

efb644ed87cad093f2b1407bc13648e092367cdc
diff --cc test/rpcgen_wrapper.sh
index dfc12448,d2101b05..0ba5d4f4
--- a/test/rpcgen_wrapper.sh
+++ b/test/rpcgen_wrapper.sh
@@@ -26,9 -26,17 +26,19 @@@ exit_failed() 
      exit 1
  }
  
+ if [ -x /usr/bin/python2 ] ; then
+   PYTHON2=/usr/bin/python2
+ elif [ "x`which python2`" != x ] ; then
+   PYTHON2=python2
+ else
+   PYTHON2=python
+ fi
+ 
  srcdir=$1
  srcdir=${srcdir:-.}
- ${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc
 -${PYTHON2} ${srcdir}/../event_rpcgen.py ${srcdir}/regress.rpc
++
++${PYTHON2} ${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc
++
  case "$?" in
   0)
      exit_updated