Detect edge case in use of npm's in-memory cache

2 files changed, 4 insertions, 2 deletions

diff --git a/lib/install.js b/lib/install.js
index 747549c8d..0094a21e8 100644
--- a/lib/install.js
+++ b/lib/install.js
@@ -151,7 +151,7 @@ function install_ (pkg, reg, seen, mustHave, pkglist, bundles, cb) {
   })
 }
 function installTargets (data) {
-  return Object.keys(data["dist-tags"])
+  return Object.keys(data["dist-tags"] || {})
     .concat(Object.keys(data.versions))
     .map(JSON.stringify)
     .join(", ") || "(none)"
@@ -159,7 +159,7 @@ function installTargets (data) {
 
 function getData (name, cb) {
   var data = npm.get(name)
-  if (data) return cb(null, data)
+  if (data && data["dist-tags"]) return cb(null, data)
   registry.get(name, function (er, data) {
     if (er) return cb(er)
     if (!data._id) data._id = name
diff --git a/lib/utils/set.js b/lib/utils/set.js
index 0d0b5cce5..4ab845915 100644
--- a/lib/utils/set.js
+++ b/lib/utils/set.js
@@ -13,9 +13,11 @@ function set (obj, key, val) {
     if (typeof val.versions[v] !== "object") return
     set(obj, key+"@"+v, val.versions[v])
   })
+  // Note that this doesn't put the dist-tags there, only updates the versions
   if (key === val.name+"@"+val.version) {
     processJson(val)
     var reg = get(obj, val.name) || {}
+    reg.name = reg._id = val.name
     set(obj, val.name, reg)
     reg.versions = get(reg, "versions") || {}
     if (!get(reg.versions, val.version)) set(reg.versions, val.version, val)