From 42ef8d3714fb054e0c336601ac6490934c01d446 Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Mon, 31 Mar 2014 22:14:21 -0700 Subject: [PATCH] Minor build id cleanup --- tools/unipackage.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/unipackage.js b/tools/unipackage.js index 21a9c1a4aa..6cbf076d2b 100644 --- a/tools/unipackage.js +++ b/tools/unipackage.js @@ -651,14 +651,16 @@ _.extend(Unipackage.prototype, { // built package's warehouse version. So it should not contain // platform-dependent data and should contain all sources of change to the // unipackage's output. See scripts/admin/build-package-tarballs.sh. + var buildTimeDirectDeps = self._buildTimeDirectDependenciesWithBuildIds(); + var buildTimePluginDeps = self._buildTimePluginDependenciesWithBuildIds(); var buildInfoJson = { builtBy: compiler.BUILT_BY, sliceDependencies: { }, pluginDependencies: self.pluginWatchSet.toJSON(), pluginProviderPackages: self.pluginProviderPackageDirs, source: options.buildOfPath || undefined, - buildTimeDirectDependencies: self._buildTimeDirectDependenciesWithBuildIds(), - buildTimePluginDependencies: self._buildTimePluginDependenciesWithBuildIds() + buildTimeDirectDependencies: buildTimeDirectDeps, + buildTimePluginDependencies: buildTimePluginDeps }; builder.reserve("unipackage.json"); @@ -907,11 +909,9 @@ _.extend(Unipackage.prototype, { _.each( self._buildTimePluginDependenciesWithBuildIds(), function (versions, pluginName) { - var pluginDepsLoader = new PackageLoader({ versions: versions }); var singlePluginDeps = []; _.each(versions, function (version, packageName) { - var unipackage = pluginDepsLoader.getPackage(packageName); - singlePluginDeps.push([unipackage.name, unipackage.version]); + singlePluginDeps.push([packageName, version]); }); singlePluginDeps = _.sortBy(singlePluginDeps, "0"); pluginDeps.push([pluginName, singlePluginDeps]);