jenkins-bot has submitted this change and it was merged.
Change subject: Return exit_status from Application._before_exit
......................................................................
Return exit_status from Application._before_exit
The default no-op implementation of Application._before_exit did not
return the input exit_status value as expected by the driver code. This
caused None to always be passed to sys.exit() regardless of any error
conditions encountered.
Bug: 62862
Change-Id: I67799553aed7a1544ef5d2f68c21bf8ecb777273
---
M scap/cli.py
M scap/main.py
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scap/cli.py b/scap/cli.py
index 3f497c4..387c852 100644
--- a/scap/cli.py
+++ b/scap/cli.py
@@ -182,7 +182,7 @@
:returns: exit status
"""
- pass
+ return exit_status
@classmethod
def run(cls, argv=sys.argv, exit=True):
diff --git a/scap/main.py b/scap/main.py
index 0d15c39..f214b19 100644
--- a/scap/main.py
+++ b/scap/main.py
@@ -192,3 +192,4 @@
if self.config:
self.stats.increment('scap.scap')
self.stats.timing('scap.scap', self.duration * 1000)
+ return exit_status
--
To view, visit https://gerrit.wikimedia.org/r/121571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67799553aed7a1544ef5d2f68c21bf8ecb777273
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
