From bed8fb0ef487b37d5096104391e2222e3e4fd1c7 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 31 Oct 2009 05:40:54 -0400 Subject: Made acprep more sensitive to failures --- acprep | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'acprep') 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() -- cgit v1.2.3