Upgrade npm to 1.1.3

* Update request to support HTTPS-over-HTTP proxy tunneling
* Throw on undefined envs in config settings
* Update which to 1.0.5
* Fix windows UNC busyloop in findPrefix
* Bundle nested bundleDependencies properly
* Alias adduser to add-user
* Doc updates  (Christian Howe, Henrik Hodne, Andrew Lunny)
* ignore logfd/outfd streams in makeEnv() (Rod Vagg)
* shrinkwrap: Behave properly with url-installed deps
* install: Support --save with url install targets
* Support installing naked tars or single-file modules from urls etc.
* init: Don't add engines section
* Don't run make clean on rebuild
* Added missing unicode replacement (atomizer)

1 files changed, 12 insertions, 7 deletions

diff --git a/deps/npm/lib/cache.js b/deps/npm/lib/cache.js
index 3dc1fb3a0..ddc4903f6 100644
--- a/deps/npm/lib/cache.js
+++ b/deps/npm/lib/cache.js
@@ -752,12 +752,14 @@ function addTmpTarball (tgz, name, cb) {
 }
 
 function addTmpTarball_ (tgz, name, uid, gid, cb) {
-  var contents = path.resolve(path.dirname(tgz))  // , "contents")
+  var contents = path.dirname(tgz)
   tar.unpack( tgz, path.resolve(contents, "package")
             , null, null
             , uid, gid
             , function (er) {
-    if (er) return log.er(cb, "couldn't unpack "+tgz+" to "+contents)(er)
+    if (er) {
+      return log.er(cb, "couldn't unpack "+tgz+" to "+contents)(er)
+    }
     fs.readdir(contents, function (er, folder) {
       if (er) return log.er(cb, "couldn't readdir "+contents)(er)
       log.verbose(folder, "tarball contents")
@@ -792,11 +794,14 @@ function unpack (pkg, ver, unpackTarget, dMode, fMode, uid, gid, cb) {
       log.error("Could not read data for "+pkg+"@"+ver)
       return cb(er)
     }
-    tar.unpack( path.join(npm.cache, pkg, ver, "package.tgz")
-             , unpackTarget
-             , dMode, fMode
-             , uid, gid
-             , cb )
+    npm.commands.unbuild([unpackTarget], function (er) {
+      if (er) return cb(er)
+      tar.unpack( path.join(npm.cache, pkg, ver, "package.tgz")
+                , unpackTarget
+                , dMode, fMode
+                , uid, gid
+                , cb )
+    })
   })
 }