jenkins-bot has submitted this change and it was merged.
Change subject: Normalize line endings
......................................................................
Normalize line endings
Follow up to If29c536a26181aacc7c957a7f7112593fc574121 .
Fixing it when creating the announcement, too.
Change-Id: Iab78a466eb773e8d70ae07ab69c6b9039d0994e8
---
M melange/BundleCreater.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/melange/BundleCreater.php b/melange/BundleCreater.php
index dc75039..5c412ed 100644
--- a/melange/BundleCreater.php
+++ b/melange/BundleCreater.php
@@ -306,7 +306,7 @@
foreach ( $this->conf['extensions'] as $ext => $checkout ) {
$notefile = $this->dir . "/notes/$version-$ext";
- $contents = file_get_contents( $notefile );
+ $contents = str_replace( array( "\r\n", "\r" ), "\n",
file_get_contents( $notefile ) );
preg_match( '/^#---$(.*)^#---$/msU', $contents,
$matches );
if ( !isset( $matches[1] ) ) {
echo "Could not parse notes for extension
$ext\n";
--
To view, visit https://gerrit.wikimedia.org/r/56718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab78a466eb773e8d70ae07ab69c6b9039d0994e8
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
