a less obnoxious banner that only comes up once

This commit is contained in:
ekatek
2014-09-19 19:34:04 -07:00
parent cfefbcf28f
commit 8e9dbe6513
2 changed files with 21 additions and 17 deletions

View File

@@ -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;

View File

@@ -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);
}