lib/_copy: fixed nasty multiple callback fs.copy() bug. Closes #98

jprichardson · Jan 28, 2015 · 35345a3 · 35345a3
1 parent a9b98ee
commit 35345a3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 - bugfix `fs.move()` into itself. Closes #104
 - bugfix `fs.move()` moving directory across device. Closes #108
 - added coveralls support
+- bugfix: nasty multiple callback `fs.copy()` bug. Closes #98
 
 0.15.0 / 2015-01-21
 -------------------

diff --git a/lib/_copy.js b/lib/_copy.js
@@ -82,15 +82,16 @@ function ncp (source, dest, options, callback) {
     var target = file.name.replace(currentPath, targetPath)
     isWritable(target, function (writable) {
       if (writable) {
-        return copyFile(file, target)
-      }
-      if(clobber) {
-        rmFile(target, function () {
-          copyFile(file, target)
-        })
+        copyFile(file, target)
+      } else {
+        if(clobber) {
+          rmFile(target, function () {
+            copyFile(file, target)
+          })
+        } else {
+          cb()
+        }
       }
-
-      return cb()
     })
   }