Bug 1365419 - Fixup l10n packager after bug 780562. r=gps
☠☠ backed out by 28dff773a7ae ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 26 May 2017 11:24:40 +0900
changeset 410010 d82aa6aec2c1c75e324ee7685a6e4abb3f7c986a
parent 410009 9aafdd1ca0bdefb641933e2761faa773f0dce558
child 410011 e5b66b34bd7c5ebb5f1d5ea713274df54e259cc1
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1365419, 780562
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1365419 - Fixup l10n packager after bug 780562. r=gps The change to l10n packager from bug 780562 worked in practice because no chrome category had exclusively manifest entries with flags, which we're changing in this bug. It turns out this was only due to a missing change in the patch for bug 780562.
python/mozbuild/mozpack/packager/l10n.py
--- a/python/mozbuild/mozpack/packager/l10n.py
+++ b/python/mozbuild/mozpack/packager/l10n.py
@@ -134,17 +134,17 @@ def _repack(app_finder, l10n_finder, cop
     paths = {}
     for e in app.entries:
         if isinstance(e, ManifestEntryWithRelPath):
             base = mozpath.basedir(e.path, app.bases)
             if base not in l10n_paths:
                 errors.fatal("Locale doesn't contain %s/" % base)
                 # Allow errors to accumulate
                 continue
-            if e.name not in l10n_paths[base]:
+            if key(e) not in l10n_paths[base]:
                 errors.fatal("Locale doesn't have a manifest entry for '%s'" %
                     e.name)
                 # Allow errors to accumulate
                 continue
             paths[e.path] = l10n_paths[base][key(e)]
 
     for pattern in non_chrome:
         for base in app.bases: