Cleanup code

package.py

@@ -914,21 +914,26 @@ def execute(self, build_plan, zip_stream, query):
                             # XXX: timestamp=0 - what actually do with it?
                             zs.write_dirs(rd, prefix=prefix, timestamp=0)
             elif cmd == "sh":
-                r, w = os.pipe()
-                side_ch = os.fdopen(r)
                 path, script = action[1:]
-                script = "set -e\n{}\nset +e;pwd >&{}".format(script, w)
-                p = subprocess.Popen(script, shell=True, cwd=path, pass_fds=(w,))
-                os.close(w)
-                sh_work_dir = side_ch.read().strip()
+                script = "set -e\n{}".format(script)
+                p = subprocess.Popen(
+                    script,
+                    shell=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    cwd=path,
+                )
+
                 p.wait()
-                log.info("WD: %s", sh_work_dir)
-                side_ch.close()
+                call_stdout, call_stderr = p.communicate()
                 exit_code = p.returncode
+                log.info("exit_code: %s", exit_code)
                 if exit_code != 0:
                     raise RuntimeError(
-                        "Script did not run successfully, exit code {}".format(
-                            exit_code
+                        "Script did not run successfully, exit code {}: {} - {}".format(
+                            exit_code,
+                            call_stdout.decode("utf-8").strip(),
+                            call_stderr.decode("utf-8").strip(),
                         )
                     )
                 patterns = action[1]