From 8e9dbe6513bc950d2bb48511fc7106260f197182 Mon Sep 17 00:00:00 2001
From: ekatek <ekate@meteor.com>
Date: Fri, 19 Sep 2014 19:34:04 -0700
Subject: [PATCH] a less obnoxious banner that only comes up once

---
 tools/catalog.js        | 37 +++++++++++++++++++++----------------
 tools/package-client.js |  1 -
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/tools/catalog.js b/tools/catalog.js
index 24a9540953..2a19177f75 100644
--- a/tools/catalog.js
+++ b/tools/catalog.js
@@ -18,7 +18,7 @@ var fiberHelpers = require('./fiber-helpers.js');
 var project = require('./project.js');
 var Future = require('fibers/future');
 var Fiber = require('fibers');
-
+var Console = require('./console.js').Console;
 var catalog = exports;
 
 catalog.DEFAULT_TRACK = 'METEOR';
@@ -558,27 +558,32 @@ _.extend(CompleteCatalog.prototype, {
     if (ret["usedRCs"]) {
       var expPackages = [];
       _.each(ret.answer, function(version, package) {
-        if (version.split('-').length > 1 &&
-            !_.findWhere(constr,
-                { packageName: package, version: version })) {
-          expPackages.push({
+        if (version.split('-').length > 1) {
+         if (!(resolverOpts.previousSolution &&
+               resolverOpts.previousSolution[package] === version)) {
+          var oldConstraints = _.where(constr, { name: package } );
+          var printMe = true;
+          _.each(oldConstraints, function (oC) {
+            _.each(oC.constraints, function (specOC) {
+              if (specOC.version === version) {
+                printMe = false;
+              }
+            });
+          });
+          if (printMe) {
+            expPackages.push({
               name: "  " + package + "@" + version,
               description: self.getVersion(package, version).description
             });
-        }
+          };
+        }}
       });
       if (!_.isEmpty(expPackages)) {
         // XXX: Couldn't figure out how to word this better for better tenses.
-        process.stderr.write(
-          "------------------------------------------------------------ \n");
-        process.stderr.write(
-          "In order to resolve constraints, we had to use the following\n"+
-            "experimental package versions:\n");
-        process.stderr.write(utils.formatList(expPackages));
-        process.stderr.write(
-          "------------------------------------------------------------ \n");
-
-        process.stderr.write("\n");
+        Console.info(
+          "\nIn order to resolve constraints, we had to use the following\n"+
+            "experimental package versions:");
+        Console.info(utils.formatList(expPackages));
       }
     }
     return ret.answer;
diff --git a/tools/package-client.js b/tools/package-client.js
index 4284ea4215..59cf1911cf 100644
--- a/tools/package-client.js
+++ b/tools/package-client.js
@@ -647,7 +647,6 @@ exports.publishPackage = function (packageSource, compileResult, conn, options)
     _.each(badConstraints, function(bad) {
       Console.stderr.write(" " + bad);
     });
-    Console.stderr.write(". \n" );
     process.exit(1);
   }