From 8d6ffd57f2bfb6201260142cc0984f86aee926cb Mon Sep 17 00:00:00 2001 From: ekatek Date: Wed, 25 Jun 2014 11:50:38 -0700 Subject: [PATCH] don't use both explicit & forced; actually merge correctly --- tools/project.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/project.js b/tools/project.js index 7e7957af48..0bb9e37d0f 100644 --- a/tools/project.js +++ b/tools/project.js @@ -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; }