From e95cc580316b94e2969e522921bb6b7b6c347de6 Mon Sep 17 00:00:00 2001 From: Avital Oliver Date: Thu, 12 Mar 2015 12:46:46 -0700 Subject: [PATCH 1/5] Fix publish-for-arch in Windows We recently changed the package tarball structure to use colonConverter in package-client.js but not in commands-package.js --- tools/commands-packages.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/commands-packages.js b/tools/commands-packages.js index 65332dc8284..6ba53bc7171 100644 --- 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; From 92ba69e860e10717d31d3d4239145c29b1d6a113 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Wed, 18 Mar 2015 00:29:35 -0700 Subject: [PATCH 2/5] 1.0.4.1 --- History.md | 6 ++++++ packages/meteor-tool/package.js | 2 +- scripts/admin/meteor-release-official.json | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/History.md b/History.md index dfaa5578977..7df099e5024 100644 --- 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/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 2064cc73c9f..d915b3b44ea 100644 --- 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/meteor-release-official.json b/scripts/admin/meteor-release-official.json index ff0b262aa0a..78d5bcb8781 100644 --- 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" From 2f1ee9f9fb25d9f8f708372e086149560939cb00 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Wed, 18 Mar 2015 00:35:23 -0700 Subject: [PATCH 3/5] banners for 1.0.4.1 --- scripts/admin/banners.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/admin/banners.json b/scripts/admin/banners.json index e7f3c9fc4d5..2a10e0958d4 100644 --- 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, Cordova\n 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, Cordova\n 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'." } } ] From 722242dd891d5defb7ddce2984bcb2ebfbdb86b8 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Wed, 18 Mar 2015 00:48:06 -0700 Subject: [PATCH 4/5] banner spacing --- scripts/admin/banners.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/admin/banners.json b/scripts/admin/banners.json index 2a10e0958d4..096f56966bb 100644 --- a/scripts/admin/banners.json +++ b/scripts/admin/banners.json @@ -5,7 +5,7 @@ "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.1: MongoDB 2.6 and 3.0 support, performance improvements, Cordova\n 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'." + "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'." } }, { From 865fdce33cade03eba2975c474908483de52e588 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Wed, 18 Mar 2015 00:53:26 -0700 Subject: [PATCH 5/5] Update docs and examples for 1.0.4.1 --- docs/.meteor/release | 2 +- docs/client/helpers.js | 2 +- examples/clock/.meteor/release | 2 +- examples/leaderboard/.meteor/release | 2 +- examples/localmarket/.meteor/release | 2 +- examples/todos/.meteor/release | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/.meteor/release b/docs/.meteor/release index 509b6f42a1d..23c04296466 100644 --- a/docs/.meteor/release +++ b/docs/.meteor/release @@ -1 +1 @@ -METEOR@1.0.4 +METEOR@1.0.4.1 diff --git a/docs/client/helpers.js b/docs/client/helpers.js index ec918a92c65..b32379594d3 100644 --- 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 index 509b6f42a1d..23c04296466 100644 --- a/examples/clock/.meteor/release +++ b/examples/clock/.meteor/release @@ -1 +1 @@ -METEOR@1.0.4 +METEOR@1.0.4.1 diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release index 509b6f42a1d..23c04296466 100644 --- a/examples/leaderboard/.meteor/release +++ b/examples/leaderboard/.meteor/release @@ -1 +1 @@ -METEOR@1.0.4 +METEOR@1.0.4.1 diff --git a/examples/localmarket/.meteor/release b/examples/localmarket/.meteor/release index 509b6f42a1d..23c04296466 100644 --- a/examples/localmarket/.meteor/release +++ b/examples/localmarket/.meteor/release @@ -1 +1 @@ -METEOR@1.0.4 +METEOR@1.0.4.1 diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release index 509b6f42a1d..23c04296466 100644 --- a/examples/todos/.meteor/release +++ b/examples/todos/.meteor/release @@ -1 +1 @@ -METEOR@1.0.4 +METEOR@1.0.4.1