lock cache → lock target

Rip out locking logic obviated by the new emphasis on atomic writes
within the cache; ensure that only one process can be writing to a given
module in node_modules at a time. All the tests pass?

1 files changed, 5 insertions, 20 deletions

diff --git a/lib/cache/add-local-tarball.js b/lib/cache/add-local-tarball.js
index 10aa97681..d10bd3dd7 100644
--- a/lib/cache/add-local-tarball.js
+++ b/lib/cache/add-local-tarball.js
@@ -9,9 +9,6 @@ var mkdir = require("mkdirp")
   , npm = require("../npm.js")
   , tar = require("../utils/tar.js")
   , pathIsInside = require("path-is-inside")
-  , locker = require("../utils/locker.js")
-  , lock = locker.lock
-  , unlock = locker.unlock
   , getCacheStat = require("./get-stat.js")
   , chownr = require("chownr")
   , inflight = require("inflight")
@@ -101,24 +98,12 @@ function addPlacedTarball_ (p, pkgData, uid, gid, resolvedSum, cb) {
     return
   }
 
-  lock(folder, function (er) {
+  mkdir(folder, function (er) {
     if (er) return cb(er)
-
-    // async try/finally
-    var originalCb = cb
-    cb = function (er, data) {
-      unlock(folder, function (er2) {
-        return originalCb(er || er2, data)
-      })
-    }
-
-    mkdir(folder, function (er) {
-      if (er) return cb(er)
-      var pj = path.join(folder, "package.json")
-      var json = JSON.stringify(pkgData, null, 2)
-      writeFileAtomic(pj, json, function (er) {
-        cb(er, pkgData)
-      })
+    var pj = path.join(folder, "package.json")
+    var json = JSON.stringify(pkgData, null, 2)
+    writeFileAtomic(pj, json, function (er) {
+      cb(er, pkgData)
     })
   })
 }