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

Enter nested job scope per package architecture when downloading

Browse Source 
This fixes a crash when two architectures need to be downloaded
for the same package. It happens when building for non-host architecture
if packages have not been cached yet.

Crash happened because progress object got reused for another download request,
and progress objects are not supposed to be reused.
This commit is contained in:
Oleksandr Chekhovskyi
2015-04-02 11:36:03 +02:00
committed by David Glasser
parent 212dee0cd5
commit a2f8efa00e
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/tropohouse.js
View File

@@ -458,16 +458,20 @@ _.extend(exports.Tropohouse.prototype, {
// try to rename over the other thing? but that's the same as in
// warehouse?
_.each(buildsToDownload, function (build) {
try {
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);
buildmessage.enterJob({
title: "downloading " + packageName + "@" + version + " for " + build.buildArchitectures + "..."
}, function() {
try {
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;