* lib/remote.exp (remote_exec): Restore original timeout value.

Signed-off-by: Ben Elliston <bje@gnu.org>
11 years ago · 6aa75b1c0c
2 changed files with 7 additions and 2 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+2016-03-05  Yvan Roux  <yvan.roux@linaro.org>
+
+	* lib/remote.exp (remote_exec): Restore original timeout value.
+
 2016-03-04  Yvan Roux  <yvan.roux@linaro.org>

 	* lib/remote.exp (standard_upload): Remove dead code.
--- a/lib/remote.exp
+++ b/lib/remote.exp
@ -310,13 +310,14 @@ proc remote_exec { hostname program args } {

    # Run it locally if appropriate.
    if { ![is_remote $hostname] } {
-	return [local_exec "$program $pargs" $inp $outp $timeout]
+	set result [local_exec "$program $pargs" $inp $outp $timeout]
    } else {
-	return [call_remote "" exec $hostname $program $pargs $inp $outp]
+	set result [call_remote "" exec $hostname $program $pargs $inp $outp]
    }

    # Restore timeout.
    set timeout $old_timeout
+    return $result
 }

 proc standard_exec { hostname args } {