diff options
| author | Michael E Brown <michael_e_brown@dell.com> | 2007-12-11 18:09:25 -0600 |
|---|---|---|
| committer | Michael E Brown <michael_e_brown@dell.com> | 2007-12-11 18:09:25 -0600 |
| commit | 7cfb96aebd24dee149e2573eae2c169fe0fc4c27 (patch) | |
| tree | b682716ef86be7753724df47a8b780c3ce29d58c /py/mock/util.py | |
| parent | feaaffe73baa6808eb229041b86cdea6f5c1c56f (diff) | |
| parent | bd5d08919539538c0bfead439fd8e3a33f3b01b3 (diff) | |
| download | mock-7cfb96aebd24dee149e2573eae2c169fe0fc4c27.tar.gz mock-7cfb96aebd24dee149e2573eae2c169fe0fc4c27.tar.xz mock-7cfb96aebd24dee149e2573eae2c169fe0fc4c27.zip | |
Merge branch 'master' of /var/ftp/pub/Applications/git/mock
* 'master' of /var/ftp/pub/Applications/git/mock:
- make "mock --chroot" non-interactive - set the exit code of "mock --chroot" to the exit code of the process run in the chroot - log the output of the process to root.log
Diffstat (limited to 'py/mock/util.py')
| -rw-r--r-- | py/mock/util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/py/mock/util.py b/py/mock/util.py index c11c6d4..cbb3653 100644 --- a/py/mock/util.py +++ b/py/mock/util.py @@ -279,11 +279,11 @@ def do(command, chrootPath=None, timeout=0, raiseExc=True, returnOutput=0, uidMa signal.signal(signal.SIGALRM, oldhandler) # mask and return just return value, plus child output - if raiseExc and os.WEXITSTATUS(ret): + if raiseExc and ((os.WIFEXITED(ret) and os.WEXITSTATUS(ret)) or os.WIFSIGNALED(ret)): if returnOutput: - raise mock.exception.Error, "Command failed: \n # %s\n%s" % (command, output) + raise mock.exception.Error, ("Command failed: \n # %s\n%s" % (command, output), ret) else: - raise mock.exception.Error, "Command failed. See logs for output.\n # %s" % command + raise mock.exception.Error, ("Command failed. See logs for output.\n # %s" % (command,), ret) return output |