Merge branch 'release-1.0.4.1'

XiaoDongLiu · Mar 18, 2015 · c775e1e · c775e1e
2 parents d6dea52 + 865fdce
commit c775e1e
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 10 deletions.
diff --git a/History.md b/History.md
@@ -1,5 +1,11 @@
 ## v.NEXT
 
+## v1.0.4.1, 2015-Mar-18
+
+* Fix regression in 1.0.4 where `meteor publish-for-arch` only worked for
+  packages without colons in their name.  #3951
+
+
 ## v1.0.4, 2015-Mar-17
 
 ### Mongo Driver

diff --git a/docs/.meteor/release b/docs/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/docs/client/helpers.js b/docs/client/helpers.js
@@ -1,4 +1,4 @@
-release = Meteor.release ? "1.0.4" : "(checkout)";
+release = Meteor.release ? "1.0.4.1" : "(checkout)";
 
 Template.registerHelper("release", release);
 

diff --git a/examples/clock/.meteor/release b/examples/clock/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/examples/localmarket/.meteor/release b/examples/localmarket/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.0.42'
+  version: '1.0.43'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/banners.json b/scripts/admin/banners.json
@@ -5,7 +5,13 @@
                    "0.9.2.1", "0.9.2.2", "0.9.3", "0.9.3.1", "0.9.4", "1.0", "1.0.1", "1.0.2", "1.0.2.1",
                    "1.0.3", "1.0.3.1", "1.0.3.2"],
       "banner": {
-        "text": "=> Meteor 1.0.4: MongoDB 2.6 and 3.0 support, performance improvements,\n   Cordova upgrades, template-specific subscriptions, and more!\n\n   This release is being downloaded in the background. Update your app to\n   Meteor 1.0.4 by running 'meteor update'."
+        "text": "=> Meteor 1.0.4.1: MongoDB 2.6 and 3.0 support, performance improvements,\n   Cordova upgrades, template-specific subscriptions, and more!\n\n   This release is being downloaded in the background. Update your app to\n   Meteor 1.0.4.1 by running 'meteor update'."
+      }
+    },
+    {
+      "versions": ["1.0.4"],
+      "banner": {
+        "text": "=> Meteor 1.0.4.1: Fixes a regression in publishing packages in 1.0.4.\n\n   This release is being downloaded in the background. Update your app to\n   Meteor 1.0.4.1 by running 'meteor update'."
       }
     }
   ]

diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,7 @@
 {
     "track": "METEOR",
-    "version": "1.0.4",
+    "version": "1.0.4.1",
+    "patchFrom": ["1.0.4"],
     "recommended": false,
     "official": true,
     "description": "The Official Meteor Distribution"

diff --git a/tools/commands-packages.js b/tools/commands-packages.js
@@ -26,6 +26,7 @@ var Console = require('./console.js').Console;
 var projectContextModule = require('./project-context.js');
 var packageMapModule = require('./package-map.js');
 var packageVersionParser = require('./package-version-parser.js');
+var colonConverter = require("./colon-converter.js");
 
 // For each release (or package), we store a meta-record with its name,
 // maintainers, etc. This function takes in a name, figures out if
@@ -593,7 +594,7 @@ main.registerCommand({
 
   // XXX Factor out with packageClient.bundleSource so that we don't
   // have knowledge of the tarball structure in two places.
-  var packageDir = files.pathJoin(sourcePath, name);
+  var packageDir = files.pathJoin(sourcePath, colonConverter.convert(name));
   if (! files.exists(packageDir)) {
     Console.error('Malformed source tarball');
     return 1;