From b9b38a20f67551f57ec192dbf6af77066c803d06 Mon Sep 17 00:00:00 2001
From: Quentin Perret <quentin.perret@arm.com>
Date: Tue, 30 Oct 2018 10:00:54 +0000
Subject: [PATCH] target: Ensure consistency between target.execute() and
conn.execute()
Commit 511d4781646b ("exceptions: Classify transient exceptions")
introduced a "will_succeed" argument in target.execute(). This argument
is then passed down to conn.execute(). However, since it is not
labelled, this argument happens to overwrite the "strip_colors" argument
of conn.execute because of its position in the list of parameters.
Fix this by labelling the parameters given to conn.execute(). While at
it, introduce a "strip_colors" parameters for target.execute() hence
keeping the APIs consistent.
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
---
devlib/target.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/devlib/target.py b/devlib/target.py
index f6e2331..191abad 100644
--- a/devlib/target.py
+++ b/devlib/target.py
@@ -362,9 +362,10 @@ class Target(object):
# execution
def execute(self, command, timeout=None, check_exit_code=True,
- as_root=False, will_succeed=False):
- return self.conn.execute(command, timeout, check_exit_code, as_root,
- will_succeed)
+ as_root=False, strip_colors=True, will_succeed=False):
+ return self.conn.execute(command, timeout=timeout,
+ check_exit_code=check_exit_code, as_root=as_root,
+ strip_colors=strip_colors, will_succeed=will_succeed)
def background(self, command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, as_root=False):
return self.conn.background(command, stdout, stderr, as_root)