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

Only choose prerelease package versions if asked

Browse Source 
Make sure 'meteor add foo' gives the same constraint to the solver as
'foo' from .meteor/packages: namely, '>=0.0.0' not
'unconstrained' (since the first rules out rcs and the second doesn't)
This commit is contained in:
David Glasser
2014-08-25 19:57:28 -07:00
parent 35d882f935
commit bfb8359499
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/constraint-solver/resolver.js
View File

@@ -362,6 +362,12 @@ ConstraintSolver.Constraint.prototype.isSatisfied = function (candidateUV,
var self = this; var self = this;
check(candidateUV, ConstraintSolver.UnitVersion); check(candidateUV, ConstraintSolver.UnitVersion);
// Pre-releases only match precisely; @1.2.3-rc1 doesn't necessarily match
// 1.2.4, and @1.2.3 doesn't necessarily match 1.2.4-rc1.
if (/-/.test(candidateUV.version) || /-/.test(self.version)) {
return self.version === candidateUV.version;
}
if (self.type === "exactly") if (self.type === "exactly")
return self.version === candidateUV.version; return self.version === candidateUV.version;

7
tools/commands-packages.js
View File

@@ -1746,9 +1746,10 @@ main.registerCommand({
packages[constraint.name] = constraint.constraintString; packages[constraint.name] = constraint.constraintString;
// Also, add it to all of our combined dependencies. // Also, add it to all of our combined dependencies.
var constraintForResolver = _.clone(constraint); // This matches code in project.calculateCombinedConstraints.
constraintForResolver.packageName = constraintForResolver.name; var constraintForResolver = _.extend(
delete constraintForResolver.name; { packageName: constraint.name },
utils.parseVersionConstraint(constraint.constraintString));
allPackages.push(constraintForResolver); allPackages.push(constraintForResolver);
}); });