Issue 5877 - Account for random locale processing order

packagerChrome.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import errno
 import glob
 import io
 import json
 import os
 import re
@@ skipping 191 matching lines @@
     # duplicated in the build.
     for to_ignore in output['included']:
         files.pop(to_ignore, None)
 
     for bundle in output['files']:
         files[bundle] = output['files'][bundle].encode('utf-8')
 
 
 def import_locales(params, files):
     for item in params['metadata'].items('import_locales'):
-        filename, keys = item
+        filename = item[0]

[Sebastian Noack, 2017/10/25 15:08:33]

Nit: This temporary variable isnt necessary.

[Wladimir Palant, 2017/10/25 15:11:48]

But helpful to make the code more readable. Otherwise you have to deduce
yourself that item[0] is a path.

         for sourceFile in glob.glob(os.path.join(os.path.dirname(item.source),
                                                  *filename.split('/'))):
+            keys = item[1]
             locale = sourceFile.split(os.path.sep)[-2]
             targetFile = os.path.join('_locales', locale, 'messages.json')
             data = json.loads(files.get(targetFile, '{}').decode('utf-8'))
 
             try:
                 with io.open(sourceFile, 'r', encoding='utf-8') as handle:
                     sourceData = json.load(handle)
 
                 # Resolve wildcard imports
                 if keys == '*':
@@ skipping 155 matching lines @@
     if devenv:
         add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)