jenkins-bot has submitted this change and it was merged.
Change subject: Force l10n rebuild after bootstrapping
......................................................................
Force l10n rebuild after bootstrapping
Call rebuildLocalisationCache.php with the `--force` command line option
after bootstrapping English l10n data.
Bug: 51174
Change-Id: I4b24b55e01180dc003a458f5ee7bd7de4128da6c
---
M bin/mw-update-l10n
1 file changed, 5 insertions(+), 9 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/mw-update-l10n b/bin/mw-update-l10n
index 57b2eb5..d3e7eeb 100755
--- a/bin/mw-update-l10n
+++ b/bin/mw-update-l10n
@@ -21,6 +21,7 @@
fi
QUIET=--quiet
+FORCE_FULL_REBUILD=
TEMP=`getopt -o '' -l verbose -- "$@"`
if [ $? -ne 0 ]; then
exit 1
@@ -64,7 +65,6 @@
fi
mwL10nCacheDir="$MW_COMMON_SOURCE/php-$mwVerNum/cache/l10n"
- mwEnCDBStubbed=
if [[ ! -e $mwL10nCacheDir/l10n_cache-en.cdb ]]; then
# Bug: 51174
# Another potential bootstrapping problem,
mergeMessageFileList.php
@@ -73,7 +73,9 @@
sudo -u l10nupdate $BINDIR/mwscript
rebuildLocalisationCache.php \
--wiki="$mwDbName" --lang=en --outdir="$mwL10nCacheDir"
--quiet ||
die
- mwEnCDBStubbed=true
+ # Force full rebuild in subequent rebuild call to override stub
l10n
+ # files
+ FORCE_FULL_REBUILD="--force"
fi
echo -n "Updating ExtensionMessages-$mwVerNum.php..."
mwTempDest=$(sudo -u apache mktemp) || die
@@ -95,17 +97,11 @@
echo "done"
fi
- if [[ -n ${mwEnCDBStubbed} ]]; then
- # Bug: 51174
- # Delete stub en localization before full l10n update.
- echo "Cleaning up stub l10n_cache-en.cdb"
- sudo -u l10nupdate rm "${mwL10nCacheDir}/l10n_cache-en.cdb"
- fi
# Rebuild all the CDB files for each language
echo -n "Updating LocalisationCache for $mwVerNum... "
sudo -u l10nupdate $BINDIR/mwscript rebuildLocalisationCache.php \
--wiki="$mwDbName" --outdir="$mwL10nCacheDir" $QUIET \
- --threads=$THREADS ||
+ --threads=$THREADS $FORCE_FULL_REBUILD ||
die
# Include JSON versions of the CDB files and add MD5 files
--
To view, visit https://gerrit.wikimedia.org/r/117821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b24b55e01180dc003a458f5ee7bd7de4128da6c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@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
