Bug 1204712 - Handle wildcards properly for localized content in jar manifests. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 15 Sep 2015 09:23:37 +0900
changeset 295364 f382a2b702e0187e684d68306a2dedce049385b3
parent 295363 95bac0001e70425acb2e55fd981e458b819856fd
child 295365 9a34f5c4aae7153c8903130b2536de884a5ad60c
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1204712
milestone43.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 1204712 - Handle wildcards properly for localized content in jar manifests. r=gps
python/mozbuild/mozbuild/jar.py
--- a/python/mozbuild/mozbuild/jar.py
+++ b/python/mozbuild/mozbuild/jar.py
@@ -383,17 +383,17 @@ class JarMaker(object):
                 for p in s.split('/'):
                     if '*' not in p:
                         yield p + '/'
             prefix = ''.join(_prefix(src))
             fmt = '%s%s %s%%s (%s%%s)' % (
                 m.group('optPreprocess') or '',
                 m.group('optOverwrite') or '',
                 out,
-                m.group('locale') or '',
+                m.group('locale').replace('%', '%%') or '',
             )
             for _srcdir in src_base:
                 finder = FileFinder(_srcdir, find_executables=False)
                 for path, _ in finder.find(src):
                     line = fmt % (path[len(prefix):], path)
                     m = self.entryline.match(line)
                     if m:
                         self._processEntryLine(m, outHelper, jf)