jenkins-bot has submitted this change and it was merged. Change subject: mwdocgen.php: Exit with exit code of passthru(doxygen) ......................................................................
mwdocgen.php: Exit with exit code of passthru(doxygen) Previously it just naturally exited which means even if the doxygen bin doesn't exist, it'll return "success". Bug: 46151 Change-Id: Ie1e3d956ce5d3e1f28c7c829bb57596113f07c4a --- M RELEASE-NOTES-1.21 M maintenance/mwdocgen.php 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21 index e7e718d..fe7f95c 100644 --- a/RELEASE-NOTES-1.21 +++ b/RELEASE-NOTES-1.21 @@ -203,6 +203,7 @@ * (bug 44719) Removed mention of non-existing maintenance/migrateCurStubs.php script in includes/DefaultSettings.php * (bug 45143) jquery.badge: Treat non-Latin variants of zero as zero as well. +* (bug 46151) mwdocgen.php should not ignore exit code of doxygen command. === API changes in 1.21 === * prop=revisions can now report the contentmodel and contentformat. diff --git a/maintenance/mwdocgen.php b/maintenance/mwdocgen.php index 5e505eb..4e41a0d 100644 --- a/maintenance/mwdocgen.php +++ b/maintenance/mwdocgen.php @@ -254,7 +254,8 @@ TEXT; -passthru( $command ); +$exitcode = 1; +passthru( $command, $exitcode ); echo <<<TEXT --------------------------------------------------- @@ -264,3 +265,5 @@ You might want to delete the temporary file $generatedConf TEXT; + +exit( $exitcode ); -- To view, visit https://gerrit.wikimedia.org/r/53939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1e3d956ce5d3e1f28c7c829bb57596113f07c4a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle <ttij...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Demon <ch...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
