From 8c034a2d7ff16936937ee1a07dbc266b2c23e005 Mon Sep 17 00:00:00 2001
From: Justin SB <justin@fathomdb.com>
Date: Thu, 16 Oct 2014 15:41:12 -0700
Subject: [PATCH] We "update the package catalog", not package metadata, not
 refresh

---
 tools/catalog-remote.js    | 4 ++--
 tools/commands-packages.js | 8 ++++----
 tools/main.js              | 2 +-
 tools/run-app.js           | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/catalog-remote.js b/tools/catalog-remote.js
index 625cd9d9b5..ccb49d303d 100644
--- a/tools/catalog-remote.js
+++ b/tools/catalog-remote.js
@@ -750,14 +750,14 @@ _.extend(RemoteCatalog.prototype, {
       Console.debug("lastSync = ", lastSync);
       if (lastSync && lastSync.timestamp) {
         if ((Date.now() - lastSync.timestamp) < options.maxAge) {
-          Console.debug("Catalog is sufficiently up-to-date; not refreshing\n");
+          Console.debug("Package catalog is sufficiently up-to-date; not updating\n");
           return false;
         }
       }
     }
 
     var updateResult = {};
-    buildmessage.enterJob({ title: 'Refreshing package metadata.' }, function () {
+    buildmessage.enterJob({ title: 'Updating package catalog.' }, function () {
       updateResult = packageClient.updateServerPackageData(self);
     });
 
diff --git a/tools/commands-packages.js b/tools/commands-packages.js
index a06d29b238..effc1e67c3 100644
--- a/tools/commands-packages.js
+++ b/tools/commands-packages.js
@@ -67,20 +67,20 @@ var doOrDie = exports.doOrDie = function (options, f) {
 
 };
 var refreshOfficialCatalogOrDie = function (options) {
-  doOrDie({title: 'Refreshing package catalog'}, function () {
+  doOrDie({title: 'Updating package catalog'}, function () {
     try {
       catalog.official.refresh(options);
     } catch (err) {
-      buildmessage.error("Unable to refresh package catalog", err);
+      buildmessage.error("Unable to update the package catalog", err);
     }
   });
 };
 
 var explainIfRefreshFailed = function (command) {
   if (catalog.official.offline) {
-    Console.info("(But we're offline, so we didn't update the local catalog, so it might exist)");
+    Console.info("(But we're offline, so we didn't update the package catalog, so it might exist)");
   } else if (command.catalogRefresh.refreshFailed) {
-    Console.info("(But the update of the local catalog failed, so it might exist)");
+    Console.info("(But the update of the package catalog failed, so it might exist)");
   }
 };
 
diff --git a/tools/main.js b/tools/main.js
index 5a9b6f49ab..c09cc74408 100644
--- a/tools/main.js
+++ b/tools/main.js
@@ -1232,7 +1232,7 @@ commandName + ": You're not in a Meteor project directory.\n" +
       throw new Error("Command does not define catalogRefresh");
     }
     if (catalogRefreshStrategy && catalogRefreshStrategy.beforeCommand) {
-      var messages = buildmessage.capture({title: 'Refreshing package catalog'}, function () {
+      var messages = buildmessage.capture({title: 'Updating package catalog'}, function () {
         catalogRefreshStrategy.beforeCommand();
       });
       if (messages.hasMessages()) {
diff --git a/tools/run-app.js b/tools/run-app.js
index 9c9668accf..bdb4bedb8e 100644
--- a/tools/run-app.js
+++ b/tools/run-app.js
@@ -430,7 +430,7 @@ _.extend(AppRunner.prototype, {
         } catch (err) {
           // XXX: Should we throw here?
           // XXX: Should we remove this entirely?
-          Console.debug("Ignoring error refreshing package catalog", err);
+          Console.debug("Ignoring error updating package catalog", err);
         }
       });
       if (refreshMessages.hasMessages()) {