github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when downloading second package build

Browse Source 
The logic to figure out which build dirs are temp dirs which need to be
freed and which are not was wrong, since it missed the non-temp

               files.pathResolve(files.pathDirname(packagePath),
                                 packageLinkTarget));

Use a more explicit way of tracking this.

(Fixed merge conflict when merging from devel.)
This commit is contained in:
David Glasser
2015-02-05 08:55:49 -08:00
parent f2f0482c69
commit 89381e98cd
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/tropohouse.js
View File

@@ -303,10 +303,11 @@ _.extend(exports.Tropohouse.prototype, {
buildmessage.enterJob({
title: "downloading " + packageName + "@" + version + "..."
}, function() {
var buildInputDirs = [];
var buildTempDirs = [];
// If there's already a package in the tropohouse, start with it.
if (packageLinkTarget) {
buildTempDirs.push(
buildInputDirs.push(
files.pathResolve(files.pathDirname(packageLinkFile),
packageLinkTarget));
}
@@ -315,20 +316,22 @@ _.extend(exports.Tropohouse.prototype, {
// warehouse?
_.each(buildsToDownload, function (build) {
try {
buildTempDirs.push(self._downloadBuildToTempDir(
{ packageName: packageName, version: version }, build));
var buildTempDir = self._downloadBuildToTempDir(
{ packageName: packageName, version: version }, build);
} catch (e) {
if (!(e instanceof files.OfflineError))
throw e;
buildmessage.error(e.error.message);
}
buildInputDirs.push(buildTempDir);
buildTempDirs.push(buildTempDir);
});
if (buildmessage.jobHasMessages())
return;
// We need to turn our builds into a single isopack.
var isopack = new Isopack;
_.each(buildTempDirs, function (buildTempDir, i) {
_.each(buildInputDirs, function (buildTempDir, i) {
isopack._loadUnibuildsFromPath(
packageName,
buildTempDir,