jenkins-bot has submitted this change and it was merged.
Change subject: Return super().main() when overriding AbstractSync.main()
......................................................................
Return super().main() when overriding AbstractSync.main()
Ensure that the exit code generated by AbstractSync.main() is propagated
when a sub class extends main() to add additional command line
arguments. This will make scap, sync-dir and sync-file properly exit
with a non-zero status code in the event of soft sync errors.
Bug: T109007
Change-Id: I26b732a5f0cb3d6e49f217679c09501991d11255
---
M scap/main.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scap/main.py b/scap/main.py
index c44b827..3a5dc21 100644
--- a/scap/main.py
+++ b/scap/main.py
@@ -202,7 +202,7 @@
help='Restart HHVM process on target hosts.')
@cli.argument('message', nargs='*', help='Log message for SAL')
def main(self, *extra_args):
- super(Scap, self).main(*extra_args)
+ return super(Scap, self).main(*extra_args)
def _before_cluster_sync(self):
self.announce('Started scap: %s', self.arguments.message)
@@ -337,7 +337,7 @@
@cli.argument('dir', help='Directory to sync')
@cli.argument('message', nargs='*', help='Log message for SAL')
def main(self, *extra_args):
- super(SyncDir, self).main(*extra_args)
+ return super(SyncDir, self).main(*extra_args)
def _before_cluster_sync(self):
# assert file exists
@@ -400,7 +400,7 @@
@cli.argument('file', help='File to sync')
@cli.argument('message', nargs='*', help='Log message for SAL')
def main(self, *extra_args):
- super(SyncFile, self).main(*extra_args)
+ return super(SyncFile, self).main(*extra_args)
def _before_cluster_sync(self):
# assert file exists
--
To view, visit https://gerrit.wikimedia.org/r/231442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26b732a5f0cb3d6e49f217679c09501991d11255
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
