mirror of
https://github.com/meteor/meteor.git
synced 2026-05-02 03:01:46 -04:00
release.load no longer needs buildmessage
It used to need buildmessage because catalog.official.getReleaseVersion used to be capable of rebuilding local packages. Now it can't! Simplify all call sites. Note that buildmessage was not actually used to express "no such release", before or now.
This commit is contained in:
@@ -831,20 +831,7 @@ Fiber(function () {
|
||||
}
|
||||
|
||||
try {
|
||||
var rel;
|
||||
var messages = buildmessage.capture({ title: "Loading release" }, function () {
|
||||
rel = release.load(releaseName);
|
||||
});
|
||||
if (messages.hasMessages()) {
|
||||
// XXX The errors that trigger this are likely things like failure to
|
||||
// load livedata when trying to refresh, or maybe failure to build some
|
||||
// local packages, or something. They probably aren't "release doesn't
|
||||
// exist"? But who knows?
|
||||
process.stderr.write("=> Errors while loading release:\n" +
|
||||
messages.formatMessages());
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
var rel = release.load(releaseName);
|
||||
} catch (e) {
|
||||
var name = releaseName;
|
||||
if (e instanceof files.OfflineError) {
|
||||
@@ -1283,29 +1270,13 @@ commandName + ": You're not in a Meteor project directory.\n" +
|
||||
// Load the latest release's metadata so that we can figure out
|
||||
// the tools version that it uses. We should only do this if
|
||||
// we know there is some latest release on this track.
|
||||
var latestRelease;
|
||||
var messages = buildmessage.capture(function () {
|
||||
latestRelease = release.load(release.latestDownloaded(e.track));
|
||||
});
|
||||
if (messages.hasMessages()) {
|
||||
process.stderr.write("=> Errors while loading latest release:\n\n");
|
||||
process.stderr.write(messages.formatMessages());
|
||||
process.exit(1);
|
||||
}
|
||||
var latestRelease = release.load(release.latestDownloaded(e.track));
|
||||
springboard(latestRelease, latestRelease.name);
|
||||
// (does not return)
|
||||
} else if (e instanceof main.SpringboardToSpecificRelease) {
|
||||
// Springboard to a specific release.
|
||||
var nextRelease;
|
||||
var relName = e.releaseRecord.track + "@" + e.releaseRecord.version;
|
||||
var messages = buildmessage.capture(function () {
|
||||
nextRelease = release.load(relName);
|
||||
});
|
||||
if (messages.hasMessages()) {
|
||||
process.stderr.write("=> " + e.msg + ":\n\n");
|
||||
process.stderr.write(messages.formatMessages());
|
||||
process.exit(1);
|
||||
}
|
||||
var nextRelease = release.load(relName);
|
||||
springboard(nextRelease, relName);
|
||||
// (does not return)
|
||||
} else if (e instanceof main.WaitForExit) {
|
||||
|
||||
@@ -221,7 +221,6 @@ release.latestDownloaded = function (track) {
|
||||
// in the world (confirmed with server).
|
||||
release.load = function (name, options) {
|
||||
options = options || {};
|
||||
buildmessage.assertInCapture();
|
||||
|
||||
if (! name) {
|
||||
return new Release({ name: null });
|
||||
@@ -274,7 +273,6 @@ release.setCurrent = function (releaseObject, forced, explicit) {
|
||||
|
||||
// XXX hack
|
||||
release._setCurrentForOldTest = function () {
|
||||
buildmessage.assertInCapture();
|
||||
if (process.env.METEOR_SPRINGBOARD_RELEASE) {
|
||||
release.setCurrent(release.load(process.env.METEOR_SPRINGBOARD_RELEASE),
|
||||
true);
|
||||
|
||||
@@ -154,9 +154,7 @@ var runTest = function () {
|
||||
|
||||
var Fiber = require('fibers');
|
||||
Fiber(function () {
|
||||
doOrThrow(function () {
|
||||
release._setCurrentForOldTest();
|
||||
});
|
||||
release._setCurrentForOldTest();
|
||||
|
||||
try {
|
||||
runTest();
|
||||
|
||||
@@ -406,9 +406,7 @@ var runTest = function () {
|
||||
var Fiber = require('fibers');
|
||||
Fiber(function () {
|
||||
setAppDir(appWithPackageDir);
|
||||
doOrThrow(function () {
|
||||
release._setCurrentForOldTest();
|
||||
});
|
||||
release._setCurrentForOldTest();
|
||||
meteorNpm._printNpmCalls = true;
|
||||
|
||||
try {
|
||||
|
||||
@@ -162,9 +162,7 @@ var runTest = function () {
|
||||
|
||||
var Fiber = require('fibers');
|
||||
Fiber(function () {
|
||||
doOrThrow(function () {
|
||||
release._setCurrentForOldTest();
|
||||
});
|
||||
release._setCurrentForOldTest();
|
||||
|
||||
try {
|
||||
runTest();
|
||||
|
||||
Reference in New Issue
Block a user