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

don't use both explicit & forced; actually merge correctly

Browse Source
This commit is contained in:
ekatek
2014-06-25 11:50:38 -07:00
parent aef7993c85
commit 8d6ffd57f2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/project.js
View File

@@ -489,11 +489,9 @@ _.extend(Project.prototype, {
// Skip the disk IO if the versions haven't changed.
if (!_.isEqual(newVersions, self.dependencies)) {
self.dependencies = newVersions;
self._recordVersions();
self._recordVersions(options);
}
self.dependencies = newVersions;
self._recordVersions(options);
return downloaded;
},
@@ -506,7 +504,7 @@ _.extend(Project.prototype, {
// If the user forced us to an explicit release, then maybe we shouldn't
// record versions, unless we are updating, in which case, we should.
if (release.forced && release.explicit && !options.alwaysRecord) {
if (release.explicit && !options.alwaysRecord) {
return;
}