github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

move declaration of official catalog

Browse Source
This commit is contained in:
Pascal Rapicault
2014-09-23 14:17:36 -04:00
parent c8aa848438
commit f2df23dbeb
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/catalog.js
View File

@@ -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);