Bug 1365419 - Fixup l10n packager after bug 780562. r?gps draft
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 26 May 2017 11:24:40 +0900
changeset 588017 e7456c148dc138566432910f30519a49f75cabbe
parent 588016 ae244f51c7271a0bcb3575ea7beba042d9a076c8
child 631435 f8743ba084951c352f7f575466f579f33cf8642e
push id61882
push userbmo:mh+mozilla@glandium.org
push dateFri, 02 Jun 2017 01:53:45 +0000
bugs1365419, 780562
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.
--- 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
-            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'" %
                 # Allow errors to accumulate
             paths[e.path] = l10n_paths[base][key(e)]
     for pattern in non_chrome:
         for base in app.bases: