From f2df23dbeb222ee8e4126b084cf4d81cf7e322fe Mon Sep 17 00:00:00 2001
From: Pascal Rapicault <pascal@rapicorp.com>
Date: Tue, 23 Sep 2014 14:17:36 -0400
Subject: [PATCH] move declaration of official catalog

---
 tools/catalog.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/catalog.js b/tools/catalog.js
index 20e4804e1c..240e32d723 100644
--- a/tools/catalog.js
+++ b/tools/catalog.js
@@ -226,7 +226,7 @@ _.extend(LayeredCatalog.prototype, {
         try {
             ret = self.resolver.resolve(deps, constr, resolverOpts);
         } catch (e) {
-          catalog.official.refresh();
+          catalogRemote.official.refresh();
           self.resolver || self._initializeResolver();
            ret = self.resolver.resolve(deps, constr, resolverOpts);
         }
@@ -310,6 +310,7 @@ _.extend(LayeredCatalog.prototype, {
 });
 
 exports.DEFAULT_TRACK = remoteCatalog.DEFAULT_TRACK;
+exports.official = remoteCatalog.official;
 
 //Instantiate the various catalogs
 if (files.inCheckout()) {
@@ -318,12 +319,9 @@ if (files.inCheckout()) {
   exports.uniload = new prebuiltBootstrap.BootstrapCatalogPrebuilt();
 }
 
-//The catalog as provided by troposhere (aka atomospherejs.com)
-exports.official = new remoteCatalog.RemoteCatalog();
-
 // This is the catalog that's used to actually drive the constraint solver: it
 // contains local packages, and since local packages always beat server
 // packages, it doesn't contain any information about the server version of
 // local packages.
 exports.complete = new LayeredCatalog();
-exports.complete.setCatalogs(new localCatalog.LocalCatalog({containingCatalog : exports.complete}), exports.official);
+exports.complete.setCatalogs(new localCatalog.LocalCatalog({containingCatalog : exports.complete}), remoteCatalog.official);