# HG changeset patch
# User greg
# Date 1493991101 14400
# Node ID 959926ea2a66d8825e43f3cd6bbf41e44b4a2913
# Parent  93b1207562d3f30e58768d84fd26b2613345b220
Uploaded

diff -r 93b1207562d3 -r 959926ea2a66 utils.py
--- a/utils.py	Fri May 05 09:31:30 2017 -0400
+++ b/utils.py	Fri May 05 09:31:41 2017 -0400
@@ -1,11 +1,30 @@
 import os
 import shutil
+import subprocess
 import sys
 
+FSTDERR = 'stderr.txt'
+FSTDOUT = 'stdout.txt'
 
-def check_execution_errors(rc, stderr):
+
+def check_execution_errors(rc, fstderr, fstdout):
     if rc != 0:
-        stop_err(stderr.read())
+        fh = open(fstdout, 'rb')
+        out_msg = fh.read()
+        fh.close()
+        fh = open(fstderr, 'rb')
+        err_msg = fh.read()
+        fh.close()
+        msg = '%s\n%s\n' % (str(out_msg), str(err_msg))
+        stop_err(msg)
+
+
+def get_response_buffers():
+    fstderr = os.path.join(os.getcwd(), FSTDERR)
+    fherr = open(fstderr, 'wb')
+    fstdout = os.path.join(os.getcwd(), FSTDOUT)
+    fhout = open(fstdout, 'wb')
+    return fherr, fhout
 
 
 def move_directory_files(source_dir, destination_dir):
@@ -18,9 +37,18 @@
         shutil.move(source_entry, destination_directory)
 
 
+def run_command(cmd):
+    fherr, fhout = get_response_buffers()
+    proc = subprocess.Popen(args=cmd, stderr=fherr, stdout=fhout, shell=True)
+    rc = proc.wait()
+    # Check results.
+    fherr.close()
+    fhout.close()
+    check_execution_errors(rc, fstderr, fstdout)
+
+
 def stop_err(msg):
-    sys.stderr.write(msg)
-    sys.exit(1)
+    sys.exit(msg)
 
 
 def write_html_output(output, title, dir):