Permalink
Browse files

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

Conflicts:
	test/rpcgen_wrapper.sh
  • Loading branch information...
2 parents 4343edf + f3009e4 commit efb644ed87cad093f2b1407bc13648e092367cdc Nick Mathewson committed Nov 16, 2012
Showing with 11 additions and 1 deletion.
  1. +11 −1 test/rpcgen_wrapper.sh
View
12 test/rpcgen_wrapper.sh
@@ -26,9 +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 --quiet ${srcdir}/regress.rpc
+
case "$?" in
0)
exit_updated

0 comments on commit efb644e

Please sign in to comment.