summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael E Brown <mebrown@michaels-house.net>2007-10-20 04:21:50 -0500
committerMichael E Brown <mebrown@michaels-house.net>2007-10-20 04:21:50 -0500
commit2e899101d2f5fc3ffae400e7a881e61c42afc782 (patch)
tree2f45501d16d2c35e1e6bac8ddc1b00a9c7f233d2
parent8c188b0837ed3492285796700115e668789e266d (diff)
downloadmock-2e899101d2f5fc3ffae400e7a881e61c42afc782.tar.gz
mock-2e899101d2f5fc3ffae400e7a881e61c42afc782.tar.xz
mock-2e899101d2f5fc3ffae400e7a881e61c42afc782.zip
set exit code properly on error.
-rwxr-xr-xsrc/mock.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mock.py b/src/mock.py
index f613e4a..0970606 100755
--- a/src/mock.py
+++ b/src/mock.py
@@ -309,6 +309,7 @@ def main(retParams):
if __name__ == '__main__':
+ exitStatus = 0
killOrphans = 1
try:
# sneaky way to ensure that we get passed back parameter even if
@@ -317,26 +318,32 @@ if __name__ == '__main__':
main(retParams)
except (KeyboardInterrupt,), e:
+ exitStatus = 7
log.error("Exiting on user interrupt, <CTRL>-C")
except (mock.exception.BadCmdline), e:
+ exitStatus = e.resultcode
log.error(str(e))
killOrphans = 0
except (mock.exception.BuildRootLocked), e:
+ exitStatus = e.resultcode
log.error(str(e))
killOrphans = 0
except (mock.exception.Error), e:
+ exitStatus = e.resultcode
log.error(str(e))
except (Exception,), e:
+ exitStatus = 1
logging.exception(e)
if killOrphans and retParams:
mock.util.orphansKill(retParams["chroot"].rootdir)
logging.shutdown()
+ sys.exit(exitStatus)