install: Fix deps getting moved on update

iarna · iarna · commit 88aafee8b5b2 · 2017-07-10T15:51:03.000-07:00
This makes circular deps get pruned when removing obsolete dependencies (for instance, when removing an older version of a dep when updating). Fixes: #17639 PR-URL: #17677 Credit: @iarna Reviewed-By; @zkat
diff --git a/lib/install.js b/lib/install.js
@@ -370,6 +370,7 @@ Installer.prototype.normalizeCurrentTree = function (cb) {
       }
     }
   }
+  computeMetadata(this.currentTree)
   return cb()
 
   function normalizeTree (tree, seen) {
diff --git a/lib/install/deps.js b/lib/install/deps.js
@@ -31,6 +31,7 @@ var isProdDep = require('./is-prod-dep.js')
 var reportOptionalFailure = require('./report-optional-failure.js')
 var getSaveType = require('./save.js').getSaveType
 var unixFormatPath = require('../utils/unix-format-path.js')
+var isExtraneous = require('./is-extraneous.js')
 
 // The export functions in this module mutate a dependency tree, adding
 // items to them.
@@ -172,7 +173,9 @@ function removeObsoleteDep (child, log) {
   var requires = child.requires || []
   requires.forEach(function (requirement) {
     requirement.requiredBy = requirement.requiredBy.filter(function (reqBy) { return reqBy !== child })
-    if (requirement.requiredBy.length === 0) removeObsoleteDep(requirement, log)
+    // we don't just check requirement.requires because that doesn't account
+    // for circular deps.  isExtraneous does.
+    if (isExtraneous(requirement)) removeObsoleteDep(requirement, log)
   })
 }
 

Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,7 @@ Installer.prototype.normalizeCurrentTree = function (cb) {`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`	`}`
	`373`	`+ computeMetadata(this.currentTree)`
`373`	`374`	`return cb()`
`374`	`375`
`375`	`376`	`function normalizeTree (tree, seen) {`