Update npm to 1.1.16

2 files changed, 6 insertions, 3 deletions

diff --git a/deps/npm/lib/utils/npm-registry-client/get.js b/deps/npm/lib/utils/npm-registry-client/get.js
index 49a8b4cc00..e0902f0276 100644
--- a/deps/npm/lib/utils/npm-registry-client/get.js
+++ b/deps/npm/lib/utils/npm-registry-client/get.js
@@ -6,8 +6,9 @@ var GET = require("./request.js").GET
   , npm = require("../../npm.js")
   , path = require("path")
   , log = require("../log.js")
-  , mkdir = require("../mkdir-p.js")
+  , mkdir = require("mkdirp")
   , cacheStat = null
+  , chownr = require("chownr")
 
 function get (project, version, timeout, nofollow, staleOk, cb) {
   if (typeof cb !== "function") cb = staleOk, staleOk = false
@@ -173,13 +174,13 @@ function saveToCache (cache, data, saved) {
 }
 
 function saveToCache_ (cache, data, uid, gid, saved) {
-  mkdir(path.dirname(cache), npm.modes.exec, uid, gid, function (er) {
+  mkdir(path.dirname(cache), function (er, made) {
     if (er) return saved()
     fs.writeFile(cache, JSON.stringify(data), function (er) {
       if (er || uid === null || gid === null) {
         return saved()
       }
-      fs.chown(cache, uid, gid, saved)
+      chownr(made || cache, uid, gid, saved)
     })
   })
 }
diff --git a/deps/npm/lib/utils/npm-registry-client/request.js b/deps/npm/lib/utils/npm-registry-client/request.js
index 5213c7966b..d5122629dd 100644
--- a/deps/npm/lib/utils/npm-registry-client/request.js
+++ b/deps/npm/lib/utils/npm-registry-client/request.js
@@ -94,6 +94,8 @@ function makeRequest (method, remote, where, what, etag, nofollow, cb) {
 
   headers.accept = "application/json"
 
+  headers["user-agent"] = npm.config.get("user-agent")
+
   opts.proxy = npm.config.get( remote.protocol === "https:"
                              ? "https-proxy" : "proxy" )