Mercurial > hg > openjdk > lambda
changeset 696:0155dba36eea
sync with updated version from TL
author | mduigou |
---|---|
date | Thu, 04 Apr 2013 11:09:40 -0700 |
parents | 5eaaf15f7b1e |
children | 22a5eca17e5b |
files | common/bin/hgforest.sh |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/common/bin/hgforest.sh Tue Feb 19 00:24:55 2013 -0800 +++ b/common/bin/hgforest.sh Thu Apr 04 11:09:40 2013 -0700 @@ -30,7 +30,7 @@ # Python always buffers stdout significantly, thus we will not see any output from hg clone jdk, # until a lot of time has passed! By passing -u to python, we get incremental updates # on stdout. Much nicer. -whichhg="`which hg`" +whichhg="`which hg 2> /dev/null | grep -v '^no hg in'`" if [ "${whichhg}" = "" ] ; then echo Cannot find hg! @@ -51,7 +51,7 @@ bpython="`basename "$python"`" fi -if [ "python" = "$bpython" -a -x "$python" ] ; then +if [ -x "$python" -a ! -d "$python" -a "`${python} -V 2>&1 | cut -f 1 -d ' '`" = "Python" ] ; then hg="${python} -u ${whichhg}" else echo Cannot find python from hg launcher. Running plain hg, which probably has buffered stdout.