mozilla-inbound: changeset 159478:572624d76edf840dbcf50006719d6e0eefce4977

☠☠ backed out by ff4ad5485e45 ☠ ☠
author	Gregory Szorc <gps@mozilla.com>
	Mon, 09 Dec 2013 19:02:35 +0900
changeset 159478	572624d76edf840dbcf50006719d6e0eefce4977
parent 159477	17a5f2e554e86d95a88d66aa3eb8741a89183fc8
child 159479	5c17264cd2d14ee4f046350b9ac32b5ba998404c
push id	37322
push user	gszorc@mozilla.com
push date	Mon, 09 Dec 2013 10:02:54 +0000
treeherder	mozilla-inbound@572624d76edf [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	glandium
bugs	934739
milestone	28.0a1
first release with	nightly linux32 df82be9d89a5 / 29.0a1 / 20131210030202 / files nightly linux64 df82be9d89a5 / 29.0a1 / 20131210030202 / files nightly mac df82be9d89a5 / 29.0a1 / 20131210030202 / files nightly win32 df82be9d89a5 / 29.0a1 / 20131210030202 / files nightly win64 df82be9d89a5 / 29.0a1 / 20131210030202 / files
last release without	nightly linux32 edac8cba9f78 / 28.0a1 / 20131208030204 / files nightly linux64 edac8cba9f78 / 28.0a1 / 20131208030204 / files nightly mac edac8cba9f78 / 28.0a1 / 20131208030204 / files nightly win32 edac8cba9f78 / 28.0a1 / 20131208030204 / files nightly win64 edac8cba9f78 / 28.0a1 / 20131208030204 / files

--- 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)