[MediaWiki-commits] [Gerrit] Delete stub l10n file after generating ExtensionMessages - change (mediawiki...scap)

2014-03-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Delete stub l10n file after generating ExtensionMessages
..


Delete stub l10n file after generating ExtensionMessages

The bootstrapping process added in I5467ac8 generates an en l10n file
before the ExtensionMessages index file is created. This file needs to
be deleted before rebuildLocalisationCache.php is run or it is likely to
be seen as being up to date based on the file's timestamp. This leads to
missing l10n values for extensions.

Bug: 51174
Change-Id: I3533aacea048c80ab04bdd83d83dff98acfc1ca2
---
M bin/mw-update-l10n
1 file changed, 10 insertions(+), 0 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/bin/mw-update-l10n b/bin/mw-update-l10n
index eb85ffd..c033875 100755
--- a/bin/mw-update-l10n
+++ b/bin/mw-update-l10n
@@ -68,6 +68,7 @@
 

mwExtensionMessages=$MW_COMMON_SOURCE/wmf-config/ExtensionMessages-${mwVerNum}.php
if [[ ! -e $mwExtensionMessages ]]; then
+   # Bug: 51174
# Touch mwExtensionMessages so that the require in 
CommonSettings
# doesn't explode while we are generating it for the first time 
on
# a new release branch.
@@ -76,13 +77,16 @@
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
# will fail if there is no en l10n data.
echo Bootstrapping en LocalisationCache for $mwVerNum... 
sudo -u l10nupdate $BINDIR/mwscript 
rebuildLocalisationCache.php \
--wiki=$mwDbName --lang=en --outdir=$mwL10nCacheDir 
--quiet ||
die
+   mwEnCDBStubbed=true
fi
echo -n Updating ExtensionMessages-$mwVerNum.php...
mwTempDest=$(sudo -u apache mktemp) || die
@@ -104,6 +108,12 @@
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
+   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 \

-- 
To view, visit https://gerrit.wikimedia.org/r/117154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3533aacea048c80ab04bdd83d83dff98acfc1ca2
Gerrit-PatchSet: 1
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: 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

[MediaWiki-commits] [Gerrit] Delete stub l10n file after generating ExtensionMessages - change (mediawiki...scap)

2014-03-05 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/117154

Change subject: Delete stub l10n file after generating ExtensionMessages
..

Delete stub l10n file after generating ExtensionMessages

The bootstrapping process added in I5467ac8 generates an en l10n file
before the ExtensionMessages index file is created. This file needs to
be deleted before rebuildLocalisationCache.php is run or it is likely to
be seen as being up to date based on the file's timestamp. This leads to
missing l10n values for extensions.

Bug: 51174
Change-Id: I3533aacea048c80ab04bdd83d83dff98acfc1ca2
---
M bin/mw-update-l10n
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/54/117154/1

diff --git a/bin/mw-update-l10n b/bin/mw-update-l10n
index eb85ffd..c033875 100755
--- a/bin/mw-update-l10n
+++ b/bin/mw-update-l10n
@@ -68,6 +68,7 @@
 

mwExtensionMessages=$MW_COMMON_SOURCE/wmf-config/ExtensionMessages-${mwVerNum}.php
if [[ ! -e $mwExtensionMessages ]]; then
+   # Bug: 51174
# Touch mwExtensionMessages so that the require in 
CommonSettings
# doesn't explode while we are generating it for the first time 
on
# a new release branch.
@@ -76,13 +77,16 @@
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
# will fail if there is no en l10n data.
echo Bootstrapping en LocalisationCache for $mwVerNum... 
sudo -u l10nupdate $BINDIR/mwscript 
rebuildLocalisationCache.php \
--wiki=$mwDbName --lang=en --outdir=$mwL10nCacheDir 
--quiet ||
die
+   mwEnCDBStubbed=true
fi
echo -n Updating ExtensionMessages-$mwVerNum.php...
mwTempDest=$(sudo -u apache mktemp) || die
@@ -104,6 +108,12 @@
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
+   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 \

-- 
To view, visit https://gerrit.wikimedia.org/r/117154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3533aacea048c80ab04bdd83d83dff98acfc1ca2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits