Skip to content
This repository
Browse code

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

Conflicts:
	test/rpcgen_wrapper.sh
  • Loading branch information...
commit efb644ed87cad093f2b1407bc13648e092367cdc 2 parents 4343edf + f3009e4
authored November 16, 2012

Showing 1 changed file with 11 additions and 1 deletion. Show diff stats Hide diff stats

  1. 12  test/rpcgen_wrapper.sh
12  test/rpcgen_wrapper.sh
@@ -26,9 +26,19 @@ exit_failed() {
26 26
     exit 1
27 27
 }
28 28
 
  29
+if [ -x /usr/bin/python2 ] ; then
  30
+  PYTHON2=/usr/bin/python2
  31
+elif [ "x`which python2`" != x ] ; then
  32
+  PYTHON2=python2
  33
+else
  34
+  PYTHON2=python
  35
+fi
  36
+
29 37
 srcdir=$1
30 38
 srcdir=${srcdir:-.}
31  
-${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc
  39
+
  40
+${PYTHON2} ${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc
  41
+
32 42
 case "$?" in
33 43
  0)
34 44
     exit_updated

0 notes on commit efb644e

Please sign in to comment.
Something went wrong with that request. Please try again.