sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next'

Browse source
This commit is contained in:
John Wiegley 2009-10-31 05:41:05 -04:00
commit b6ecbd2637
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
acprep
View file

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