summaryrefslogtreecommitdiff
path: root/deps/npm/lib
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2014-01-06 17:02:07 -0800
committerisaacs <i@izs.me>2014-01-06 17:02:07 -0800
commit1be93659303c89c4cae2b7974e41c8fbeb7ea108 (patch)
tree1dcb5bf6c3c608185f4a055b445df88099c27c24 /deps/npm/lib
parentb922b5e90d2c14dd332b95827c2533e083df7e55 (diff)
downloadnode-new-1be93659303c89c4cae2b7974e41c8fbeb7ea108.tar.gz
npm: Upgrade to 1.3.23
Diffstat (limited to 'deps/npm/lib')
-rw-r--r--deps/npm/lib/adduser.js2
-rw-r--r--deps/npm/lib/install.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/deps/npm/lib/adduser.js b/deps/npm/lib/adduser.js
index f0a58555ec..efb0691966 100644
--- a/deps/npm/lib/adduser.js
+++ b/deps/npm/lib/adduser.js
@@ -93,7 +93,7 @@ function readPassword (c, u, cb) {
function readEmail (c, u, cb) {
var v = userValidate.email
- read({prompt: "Email: ", default: c.e}, function (er, em) {
+ read({prompt: "Email: (this IS public) ", default: c.e}, function (er, em) {
if (er) {
return cb(er.message === "cancelled" ? er.message : er)
}
diff --git a/deps/npm/lib/install.js b/deps/npm/lib/install.js
index f408985a4c..790879d0d7 100644
--- a/deps/npm/lib/install.js
+++ b/deps/npm/lib/install.js
@@ -175,7 +175,8 @@ function install (args, cb_) {
, parent: data
, root: true
, wrap: null }
- if (data) {
+ if (data && data.name === path.basename(where) &&
+ path.basename(path.dirname(where)) === "node_modules") {
context.family[data.name] = context.ancestors[data.name] = data.version
}
var fn = npm.config.get("global") ? installMany : installManyTop