From 45cc54fb63bbf956dec6109152b586ea9dbaf8eb Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Sun, 16 Nov 2014 15:23:33 -0800
Subject: [PATCH] comment and require cleanup

---
 tools/bundler.js   | 1 -
 tools/catalog.js   | 1 -
 tools/commands.js  | 2 +-
 tools/release.js   | 1 -
 tools/run-app.js   | 1 -
 tools/stats.js     | 1 -
 tools/upgraders.js | 4 +++-
 7 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tools/bundler.js b/tools/bundler.js
index 94a58828f8..2e25d54c53 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -157,7 +157,6 @@ var archinfo = require(path.join(__dirname, 'archinfo.js'));
 var buildmessage = require('./buildmessage.js');
 var fs = require('fs');
 var _ = require('underscore');
-var project = require(path.join(__dirname, 'project.js'));
 var isopackets = require("./isopackets.js");
 var watch = require('./watch.js');
 var release = require('./release.js');
diff --git a/tools/catalog.js b/tools/catalog.js
index 590f19a395..b36a9ee69a 100644
--- a/tools/catalog.js
+++ b/tools/catalog.js
@@ -7,7 +7,6 @@ var tropohouse = require('./tropohouse.js');
 var localCatalog = require('./catalog-local.js');
 var remoteCatalog = require('./catalog-remote.js');
 var files = require('./files.js');
-var project = require('./project.js');
 var utils = require('./utils.js');
 var config = require('./config.js');
 var packageClient = require('./package-client.js');
diff --git a/tools/commands.js b/tools/commands.js
index 2204b34959..04f403391e 100644
--- a/tools/commands.js
+++ b/tools/commands.js
@@ -5,7 +5,6 @@ var fs = require('fs');
 var files = require('./files.js');
 var deploy = require('./deploy.js');
 var buildmessage = require('./buildmessage.js');
-var project = require('./project.js').project;
 var warehouse = require('./warehouse.js');
 var auth = require('./auth.js');
 var authClient = require('./auth-client.js');
@@ -609,6 +608,7 @@ main.registerCommand({
 
 // For testing upgraders during development.
 // XXX move under admin?
+// XXX #3006 Once we've fixed the upgrader call in update, fix this.
 main.registerCommand({
   name: 'run-upgrader',
   hidden: true,
diff --git a/tools/release.js b/tools/release.js
index 68fd3b5505..98866e1de0 100644
--- a/tools/release.js
+++ b/tools/release.js
@@ -1,7 +1,6 @@
 var _ = require('underscore');
 var path = require('path');
 var files = require('./files.js');
-var project = require('./project.js').project;
 var warehouse = require('./warehouse.js');
 var catalog = require('./catalog.js');
 var utils = require('./utils.js');
diff --git a/tools/run-app.js b/tools/run-app.js
index c1fcb9d754..0dd6bbb14a 100644
--- a/tools/run-app.js
+++ b/tools/run-app.js
@@ -6,7 +6,6 @@ var Fiber = require('fibers');
 var fiberHelpers = require('./fiber-helpers.js');
 var files = require('./files.js');
 var watch = require('./watch.js');
-var project = require('./project.js').project;
 var bundler = require('./bundler.js');
 var release = require('./release.js');
 var buildmessage = require('./buildmessage.js');
diff --git a/tools/stats.js b/tools/stats.js
index fcd2ea7f18..2ae79a1ac4 100644
--- a/tools/stats.js
+++ b/tools/stats.js
@@ -4,7 +4,6 @@ var os = require("os");
 
 var config = require("./config.js");
 var files = require("./files.js");
-var project = require("./project.js");
 var auth = require("./auth.js");
 var ServiceConnection = require("./service-connection.js");
 var release = require("./release.js");
diff --git a/tools/upgraders.js b/tools/upgraders.js
index e46b962c68..7a7da88422 100644
--- a/tools/upgraders.js
+++ b/tools/upgraders.js
@@ -1,7 +1,6 @@
 var _ = require('underscore');
 var fs = require('fs');
 var path = require('path');
-var project = require('./project.js');
 var files = require('./files.js');
 
 // This file implements "upgraders" --- functions which upgrade a Meteor app to
@@ -27,6 +26,7 @@ var maybePrintNoticeHeader = function () {
 var upgradersByName = {
    "notices-for-0.9.0": function () {
      maybePrintNoticeHeader();
+     // XXX #3006 needs updating
      if (fs.existsSync(path.join(project.project.rootDir, 'smart.json'))) {
        // Meteorite apps:
        console.log(
@@ -72,6 +72,7 @@ var upgradersByName = {
   // In 0.9.4, the platforms file contains "server" and "browser" as platforms,
   // and before it only had "ios" and/or "android"
   "0.9.4-platform-file": function () {
+    // XXX #3006 needs updating
     var oldPlatformsPath =
       path.join(project.project.rootDir, ".meteor", "cordova-platforms");
 
@@ -116,6 +117,7 @@ exports.runUpgrader = function (upgraderName) {
 
 exports.upgradersToRun = function () {
   var ret = [];
+  // XXX #3006 needs updating
   var finishedUpgraders = project.project.getFinishedUpgraders();
   // This relies on the fact that Node guarantees object iteration ordering.
   _.each(upgradersByName, function (func, name) {