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

When upgrading packages, don't pin anything.

Browse Source 
Fixes #2526.
This commit is contained in:
David Glasser
2014-09-05 14:54:23 -07:00
parent 853ef8535c
commit 53e240c70e
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/constraint-solver/constraint-solver.js
View File

@@ -219,13 +219,19 @@ ConstraintSolver.PackagesResolver.prototype.resolve = function (
// constraints without changing any of the previous versions (though we may
// add more choices in addition, or remove some now-unnecessary choices) then
// that's our first try.
if (!_.isEmpty(options.previousSolution)) {
//
// If we're intentionally trying to upgrade some or all packages, we just skip
// this step. We used to try to do this step but just leaving off pins from
// the packages we're trying to upgrade, but this tended to not lead to actual
// upgrades since we were still pinning things that the to-upgrade package
// depended on. (We still use the specific contents of options.upgrade to
// guide which things are encouraged to be upgraded vs stay the same in the
// heuristic.)
if (!_.isEmpty(options.previousSolution) && _.isEmpty(options.upgrade)) {
var constraintsWithPreviousSolutionLock = _.clone(dc.constraints);
_.each(options.previousSolution, function (uv) {
if (!_.has(options.upgrade, uv.name)) {
constraintsWithPreviousSolutionLock.push(
self.resolver.getConstraint(uv.name, '=' + uv.version));
}
constraintsWithPreviousSolutionLock.push(
self.resolver.getConstraint(uv.name, '=' + uv.version));
});
try {
// Try running the resolver. If it fails to resolve, that's OK, we'll keep