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

Conflicts:
	test/rpcgen_wrapper.sh
This commit is contained in:
Nick Mathewson 2012-11-16 10:29:37 -05:00
commit efb644ed87

View File

@ -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