Bug 1534381 - Adjust paths to match the jarlog on mac. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 12 Mar 2019 17:13:42 +0000
changeset 521615 af754eae965880c9ef86d98976a8dac0aac054d9
parent 521614 3e9b5b700a9d49cce14b1636df6f2096876bb616
child 521616 f6582e6dba4b9a588312e100c74e9b87b554f716
push id10867
push userdvarga@mozilla.com
push dateThu, 14 Mar 2019 15:20:45 +0000
treeherdermozilla-beta@abad13547875 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1534381
milestone67.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 1534381 - Adjust paths to match the jarlog on mac. r=chmanchester Differential Revision: https://phabricator.services.mozilla.com/D23065
toolkit/mozapps/installer/packager.py
--- a/toolkit/mozapps/installer/packager.py
+++ b/toolkit/mozapps/installer/packager.py
@@ -326,16 +326,18 @@ def main():
             omnijars = [mozpath.join(base, buildconfig.substs['OMNIJAR_NAME'])
                         for base in sink.packager.get_bases(addons=False)]
 
         from mozpack.mozjar import JarLog
         log = JarLog(args.jarlog)
         for p, f in copier:
             if not isinstance(f, Jarrer):
                 continue
+            if respath:
+                p = mozpath.relpath(p, respath)
             if p in log:
                 f.preload(log[p])
             elif p in omnijars:
                 raise Exception('No jar log data for %s' % p)
 
     copier.copy(args.destination)
     generate_precomplete(os.path.normpath(os.path.join(args.destination,
                                                        respath)))