merging 'meteor show' changes

This is mostly cleaning up some syntax errrors that have resulted from
merging the previous commits.

tools/commands-packages-query.js

@@ -809,7 +809,7 @@ _.extend(PackageQuery.prototype, {
         catalog.official.getVersion(data.name, data.version)) {
       Console.info();
       Console.info(
-        "This package version is build locally from source.",
+        "This package version is built locally from source.",
         "The same version of this package also exists on the package server.",
         "To view its metadata, run",
         Console.command("'meteor show " + data.name + "@" + data.version + "'"),

tools/package-client.js

@@ -721,6 +721,7 @@ exports.publishPackage = function (options) {
     });
     if (buildmessage.jobHasMessages())
       return;
+console.log(uploadInfo);
 
     // XXX If package version already exists, print a nice error message
     // telling them to try 'meteor publish-for-arch' if they want to
@@ -740,13 +741,6 @@ exports.publishPackage = function (options) {
     if (buildmessage.jobHasMessages())
       return;
 
-    buildmessage.enterJob("publishing package " + name, function () {
-      callPackageServerBM(conn, 'publishPackageVersion',
-                          uploadInfo.uploadToken,
-                          { tarballHash: sourceBundleResult.tarballHash,
-                            treeHash: sourceBundleResult.treeHash });
-    });
-
     var hashes = {
       tarballHash: sourceBundleResult.tarballHash,
       treeHash: sourceBundleResult.treeHash,
@@ -766,7 +760,8 @@ exports.publishPackage = function (options) {
     }
 
     return;
-  };
+  }
+};
 
   // Call the server to ask if we are authorized to update this release or
 // package. This is a way to save time before sending data to the server. It

tools/tests/package-tests.js

@@ -1335,8 +1335,9 @@ selftest.define("show and search local overrides server",
 
     // When we ask for version 1.0.0, we get the local version.
     var addendum =
-      "The same version of this package also exists on the package server. " +
-      "To view its\nmetadata, run 'meteor show " + fullPackageName +
+      "This package version is built locally from source. " +
+      "The same version of this\npackage also exists on the package server. " +
+      "To view its metadata, run\n'meteor show " + fullPackageName +
       "@1.0.0' from outside the project.";
     testShowPackageVersion(s, {
       packageName: fullPackageName,