From: Timo Tijhof <ttijhof@wikimedia.org>
Date: Fri, 15 Mar 2013 05:43:56 +0000 (+0100)
Subject: mwdocgen.php: Exit with exit code of passthru(doxygen)
X-Git-Tag: 1.31.0-rc.0~20336^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=5de8086d35c8192c1d58739375461807688674da;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index e7e718dd04..fe7f95cc19 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -203,6 +203,7 @@ production.
 * (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 5e505eba57..4e41a0ddbd 100644
--- a/maintenance/mwdocgen.php
+++ b/maintenance/mwdocgen.php
@@ -254,7 +254,8 @@ $command
 
 TEXT;
 
-passthru( $command );
+$exitcode = 1;
+passthru( $command, $exitcode );
 
 echo <<<TEXT
 ---------------------------------------------------
@@ -264,3 +265,5 @@ Check above for possible errors.
 You might want to delete the temporary file $generatedConf
 
 TEXT;
+
+exit( $exitcode );