Bug 934739 - Part 2b: Fix build bustage; r=glandium on a CLOSED TREE
☠☠ backed out by ff4ad5485e45 ☠ ☠
authorGregory Szorc <gps@mozilla.com>
Mon, 09 Dec 2013 19:02:35 +0900
changeset 159478 572624d76edf840dbcf50006719d6e0eefce4977
parent 159477 17a5f2e554e86d95a88d66aa3eb8741a89183fc8
child 159479 5c17264cd2d14ee4f046350b9ac32b5ba998404c
push id37322
push usergszorc@mozilla.com
push dateMon, 09 Dec 2013 10:02:54 +0000
treeherdermozilla-inbound@572624d76edf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs934739
milestone28.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 934739 - Part 2b: Fix build bustage; r=glandium on a CLOSED TREE
python/mozbuild/mozpack/manifests.py
--- a/python/mozbuild/mozpack/manifests.py
+++ b/python/mozbuild/mozpack/manifests.py
@@ -280,16 +280,14 @@ class InstallManifest(object):
 
                 if install_type == self.PATTERN_SYMLINK:
                     cls = AbsoluteSymlinkFile
                 else:
                     cls = File
 
                 for path in paths:
                     source = mozpath.join(base, path)
-                    dest = mozpath.join(dest, path)
-
-                    registry.add(dest, cls(source))
+                    registry.add(mozpath.join(dest, path), cls(source))
 
                 continue
 
             raise Exception('Unknown install type defined in manifest: %d' %
                 install_type)