Merge branch 'next'

1 files changed, 14 insertions, 4 deletions

diff --git a/acprep b/acprep
index e93ed344..bff1fce5 100755
--- a/acprep
+++ b/acprep
@@ -308,6 +308,9 @@ class PrepareBuild(CommandLineApp):
             if retcode < 0:
                 self.log.error("Child was terminated by signal", -retcode)
                 sys.exit(1)
+            elif retcode != 0:
+                self.log.error("Execution failed: " + string.join(args, ' '))
+                sys.exit(1)
         except OSError, e:
             self.log.error("Execution failed:", e)
             sys.exit(1)
@@ -316,11 +319,15 @@ class PrepareBuild(CommandLineApp):
         try:
             self.log.debug('Executing command: ' + string.join(args, ' '))
 
-            proc = Popen(args, shell=False, stdout=PIPE)
-            stdout = proc.stdout.read()
-            if proc.wait() < 0:
+            proc    = Popen(args, shell=False, stdout=PIPE)
+            stdout  = proc.stdout.read()
+            retcode = proc.wait()
+            if retcode < 0:
                 self.log.error("Child was terminated by signal",
-                               -proc.returncode)
+                               -retcode)
+                sys.exit(1)
+            elif retcode != 0:
+                self.log.error("Execution failed: " + string.join(args, ' '))
                 sys.exit(1)
             return stdout[:-1]
         except OSError, e:
@@ -1150,6 +1157,9 @@ class PrepareBuild(CommandLineApp):
                 if retcode < 0:
                     self.log.error("Child was terminated by signal", -retcode)
                     sys.exit(1)
+                elif retcode != 0:
+                    self.log.error("Execution failed: " + string.join(conf_args, ' '))
+                    sys.exit(1)
 
                 if not self.options.no_patch:
                     self.phase_patch()