diff options
| author | Jean-Philippe Lesot <jplesot@google.com> | 2015-04-09 02:55:47 +0200 |
|---|---|---|
| committer | Jean-Philippe Lesot <jplesot@google.com> | 2015-04-09 02:55:47 +0200 |
| commit | e32b97aa2166a07bb07ab0a5a4f1543e0e663f3f (patch) | |
| tree | 990cbeec4b4a47b04deec81a8a133342ba38e8ba | |
| parent | d4d785b3d9e6895805abe3968b7808c90e44c843 (diff) | |
| download | toolchain_jack-e32b97aa2166a07bb07ab0a5a4f1543e0e663f3f.zip toolchain_jack-e32b97aa2166a07bb07ab0a5a4f1543e0e663f3f.tar.gz toolchain_jack-e32b97aa2166a07bb07ab0a5a4f1543e0e663f3f.tar.bz2 | |
Jack script ignores proxy
Bug: 20125903
Change-Id: I464b708f48d4f6e8d95fe11813300214d9512f56
| -rwxr-xr-x | jack/etc/jack | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jack/etc/jack b/jack/etc/jack index ed6968c..1390450 100755 --- a/jack/etc/jack +++ b/jack/etc/jack @@ -113,7 +113,7 @@ trap ERR # Launch compilation RETRY=3 while true; do - HTTP_CODE=$(curl --fail --silent --data @- --output "$JACK_EXIT" --write-out %{http_code} http://127.0.0.1:$SERVER_PORT_SERVICE/jack <<< "+ $JACK_OUT $JACK_ERR $JACK_CLI") + HTTP_CODE=$(curl --fail --silent --data @- --output "$JACK_EXIT" --write-out %{http_code} --no-proxy 127.0.0.1:$SERVER_PORT_SERVICE http://127.0.0.1:$SERVER_PORT_SERVICE/jack <<< "+ $JACK_OUT $JACK_ERR $JACK_CLI") CURL_CODE=$? JACK_CODE=$(cat "$JACK_EXIT") if [ $CURL_CODE -eq 0 ]; then @@ -143,13 +143,13 @@ while true; do kill -QUIT $$ else # Other - echo "Internal unknown error, see server log" >&2 + echo "Internal unknown error, try other ports in ~/.jack, or see server log ($HTTP_CODE)" >&2 kill -QUIT $$ fi else # In case of partial, timeout, empty, network error, let's retry if [ $RETRY -eq 0 ]; then - echo "Communication error with server, error code " $CURL_CODE + echo "Communication error with server ($CURL_CODE)" kill -QUIT $$ else let RETRY=RETRY-1 |