aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2016-06-21 10:16:54 +1000
committerRob Savoye <rob@welcomehome.org>2016-06-21 16:05:29 -0600
commitb75ef18741fe4b92f5d1ddb0d807c4e541a1f883 (patch)
treea2ac9451f8db955378c69f584c07b0fadc46cb34
parent1a252a600407a35cae3959b3157cf7fff37691fe (diff)
* config/adb.exp (adb_exec) Improve verbose message.linaro-local/linaro-branch-backup
Signed-off-by: Ben Elliston <bje@gnu.org> (cherry picked from commit 41d08e3268729111c375f62b288baac90ccc1401)
-rw-r--r--config/adb.exp4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/adb.exp b/config/adb.exp
index 4326fa4..8b4ba8a 100644
--- a/config/adb.exp
+++ b/config/adb.exp
@@ -163,7 +163,11 @@ proc adb_exec { boardname cmd args } {
set inp "/dev/null"
}
+<<<<<<< HEAD
verbose "Executing $boardname:$cmd $pargs < $inp "
+=======
+ verbose "Executing on $boardname: $cmd $pargs < $inp"
+>>>>>>> 41d08e3... * config/adb.exp (adb_exec) Improve verbose message.
# Execute commands only from temporary folder, therefore do "cd" first
global android_tmp_dir