Eliminate use of my_tee.
lib/gen_robot_plug_in.py
- rvalidate_plug_ins: I added call to sprint_error() to format error message.
- rprocess_plug_in_packages: I eliminated the use of my_tee (which is not
available in git repo).
Change-Id: Ifb62853887de9efface1d5a42e2a5c7477c1d9bf
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/lib/gen_robot_plug_in.py b/lib/gen_robot_plug_in.py
index 9494365..2acd334 100755
--- a/lib/gen_robot_plug_in.py
+++ b/lib/gen_robot_plug_in.py
@@ -40,8 +40,8 @@
if rc != 0:
message = gp.sprint_varx("rc", rc, 1) + out_buf
grp.rprintn(out_buf, 'STDERR')
- BuiltIn().fail("Validate plug ins call failed. See stderr text for" +
- " details.\n")
+ BuiltIn().fail(gp.sprint_error("Validate plug ins call failed. See" +
+ " stderr text for details.\n"))
plug_in_packages_list = out_buf.split("\n")
if len(plug_in_packages_list) == 1 and plug_in_packages_list[0] == "":
@@ -173,8 +173,9 @@
if int(quiet) == 1:
cmd_buf = sub_cmd_buf + " > " + temp_file_path + " 2>&1"
else:
- cmd_buf = "my_tee" + debug_string + " " + temp_file_path + " -c '" +\
- sub_cmd_buf + "'"
+ cmd_buf = "set -o pipefail ; " + sub_cmd_buf + " 2>&1 | tee " +\
+ temp_file_path
+
if int(debug) == 1:
grp.rpissuing(cmd_buf)