From 814877409923bbf135b9bc4e07817cbca6e3f1da Mon Sep 17 00:00:00 2001 From: David Glasser Date: Fri, 24 Oct 2014 14:01:21 -0700 Subject: [PATCH] Use display code for more release names --- tools/commands-packages.js | 10 +++++----- tools/commands.js | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/commands-packages.js b/tools/commands-packages.js index 51b72ebdf7..be5ff579bc 100644 --- a/tools/commands-packages.js +++ b/tools/commands-packages.js @@ -1662,17 +1662,17 @@ var maybeUpdateRelease = function (options) { // help --release xyz'. Console.info( "Installed. Run 'meteor update' inside of a particular project\n" + - "directory to update that project to Meteor " + - release.current.name + "."); + "directory to update that project to " + + release.current.getDisplayName() + "."); } else { // We get here if the user ran 'meteor update' and we didn't // find a new version. Console.info( - "The latest version of Meteor, " + release.current.name + + "The latest version of Meteor, " + release.current.getReleaseVersion() + ", is already installed on this\n" + "computer. Run 'meteor update' inside of a particular project\n" + - "directory to update that project to Meteor " + - release.current.name); + "directory to update that project to " + + release.current.getDisplayName()); } return 0; } diff --git a/tools/commands.js b/tools/commands.js index 6300880a4e..c0149ebe40 100644 --- a/tools/commands.js +++ b/tools/commands.js @@ -313,8 +313,11 @@ function doRunCommand (options) { if (release.forced) { var appRelease = project.getNormalizedMeteorReleaseVersion(); if (release.current.name !== appRelease) { - console.log("=> Using Meteor %s as requested (overriding Meteor %s)", - release.current.name, appRelease); + var appReleaseParts = utils.splitReleaseName(appRelease); + console.log("=> Using %s as requested (overriding Meteor %s)", + release.current.getDisplayName(), + utils.displayRelease(appReleaseParts[0], + appReleaseParts[1])); console.log(); } }