addLocalTarball: chown from the first created dir, not just the target dir

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/cache/add-local-tarball.js b/lib/cache/add-local-tarball.js
index bcb938fa9..211036d5d 100644
--- a/lib/cache/add-local-tarball.js
+++ b/lib/cache/add-local-tarball.js
@@ -191,7 +191,13 @@ function addTmpTarball_ (tgz, data, shasum, cb) {
   var target = path.resolve(root, "package.tgz")
   getCacheStat(function (er, cs) {
     if (er) return cb(er)
-    mkdir(pkg, function (er) {
+    mkdir(pkg, function (er, created) {
+
+      // chown starting from the first dir created by mkdirp
+      function chown () {
+        chownr(created, cs.uid, cs.gid, done)
+      }
+
       if (er) return cb(er)
       var read = fs.createReadStream(tgz)
       var write = fs.createWriteStream(target)
@@ -199,9 +205,6 @@ function addTmpTarball_ (tgz, data, shasum, cb) {
       read.on("error", cb).pipe(write).on("error", cb).on("close", fin)
     })
 
-    function chown () {
-      chownr(root, cs.uid, cs.gid, done)
-    }
   })
 
   function done() {