From cdbaca0b8bf877378c4079ee674a18007fd82b74 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 16 Oct 2014 15:21:09 -0700
Subject: [PATCH] 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.
---
 tools/main.js                           | 35 +++----------------------
 tools/release.js                        |  2 --
 tools/tests/old/test-bundler-assets.js  |  4 +--
 tools/tests/old/test-bundler-npm.js     |  4 +--
 tools/tests/old/test-bundler-options.js |  4 +--
 5 files changed, 6 insertions(+), 43 deletions(-)

diff --git a/tools/main.js b/tools/main.js
index 12401c5296..6f9e325bb0 100644
--- a/tools/main.js
+++ b/tools/main.js
@@ -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) {
diff --git a/tools/release.js b/tools/release.js
index 1895f36fd2..d26a50434b 100644
--- a/tools/release.js
+++ b/tools/release.js
@@ -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);
diff --git a/tools/tests/old/test-bundler-assets.js b/tools/tests/old/test-bundler-assets.js
index 984b380c4d..dd67bbc977 100644
--- a/tools/tests/old/test-bundler-assets.js
+++ b/tools/tests/old/test-bundler-assets.js
@@ -154,9 +154,7 @@ var runTest = function () {
 
 var Fiber = require('fibers');
 Fiber(function () {
-  doOrThrow(function () {
-    release._setCurrentForOldTest();
-  });
+  release._setCurrentForOldTest();
 
   try {
     runTest();
diff --git a/tools/tests/old/test-bundler-npm.js b/tools/tests/old/test-bundler-npm.js
index c46aca92e6..6e2ce36419 100644
--- a/tools/tests/old/test-bundler-npm.js
+++ b/tools/tests/old/test-bundler-npm.js
@@ -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 {
diff --git a/tools/tests/old/test-bundler-options.js b/tools/tests/old/test-bundler-options.js
index b4157bf119..6322de8b5f 100644
--- a/tools/tests/old/test-bundler-options.js
+++ b/tools/tests/old/test-bundler-options.js
@@ -162,9 +162,7 @@ var runTest = function () {
 
 var Fiber = require('fibers');
 Fiber(function () {
-  doOrThrow(function () {
-    release._setCurrentForOldTest();
-  });
+  release._setCurrentForOldTest();
 
   try {
     runTest();