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

Checkouts don't load releases, take 2

Browse Source
This commit is contained in:
Avital Oliver
2013-02-25 17:47:54 -08:00
committed by David Glasser
parent dcc44529ad
commit c6a4b63e98
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/bundler.js
View File

@@ -787,12 +787,10 @@ exports.bundle = function (app_dir, output_path, options) {
packages.flush();
var bundle = new Bundle;
if (!files.in_checkout()) {
if (options.versionOverride)
bundle.releaseManifest = warehouse.releaseManifestByVersion(options.versionOverride);
else
bundle.releaseManifest = warehouse.releaseManifestForApp(app_dir);
}
if (options.versionOverride)
bundle.releaseManifest = warehouse.releaseManifestByVersion(options.versionOverride);
else
bundle.releaseManifest = warehouse.releaseManifestForApp(app_dir);
// our release manifest is set, let's now load the app
var app = packages.get_for_app(app_dir, ignore_files);

11
lib/warehouse.js
View File

@@ -46,6 +46,8 @@ var warehouse = module.exports = {
return path.join(warehouse.getWarehouseDir(), 'engines', version);
},
// If you're running from a git checkout, return null.
//
// If .meteor/release exists, load the manifest corresponding to
// that meteor release. Load from packages.meteor.com and store in
// the warehouse on disk. Parse and ensure that all used package
@@ -53,6 +55,9 @@ var warehouse = module.exports = {
//
// If .meteor/release does not exist, return null.
releaseManifestForApp: function (appDir) {
if (files.in_checkout())
return null;
var releaseVersion = project.getMeteorReleaseVersion(appDir);
if (!releaseVersion) {
@@ -62,7 +67,13 @@ var warehouse = module.exports = {
}
},
// If you're running from a git checkout, return null. Otherwise,
// ensure the passed release version is stored in the local
// warehouse and return its parsed manifest.
releaseManifestByVersion: function(releaseVersion) {
if (files.in_checkout())
return null;
var project = require(path.join(__dirname, 'project.js'));
var releaseManifestPath = path.join(