code/wrench-js
Archived
1
Fork 0
Code Issues 22 Pull requests 7 Projects Releases Packages Wiki Activity Actions

Resolve this merge conflict that I somehow 100% totally missed (fixes #63)

Browse source
This commit is contained in:
Ryan McGrath 2013-10-16 07:46:46 +09:00
parent 99686fbdc2
commit 5c716f9c0d
2 changed files with 24 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/wrench.js
View file

@ -355,13 +355,8 @@ exports.rmdirRecursive = function rmdirRecursive(dir, failSilent, clbk){
if(err && typeof failSilent === 'boolean' && !failSilent) if(err && typeof failSilent === 'boolean' && !failSilent)
return clbk(err); return clbk(err);
<<<<<<< HEAD
if(typeof failSilent === 'function') if(typeof failSilent === 'function')
clbk = failSilent; clbk = failSilent;
=======
if(typeof failSilent === 'function')
clbk = failSilent;
>>>>>>> 7827a700ff8cb8b742e401e9876e86a63ae0c68a
(function rmFile(err){ (function rmFile(err){
if (err) return clbk(err); if (err) return clbk(err);
@ -396,7 +391,6 @@ exports.copyDirRecursive = function copyDirRecursive(srcDir, newDir, opts, clbk)
fs.stat(newDir, function(err, newDirStat) { fs.stat(newDir, function(err, newDirStat) {
if(!err) { if(!err) {
<<<<<<< HEAD
if(typeof opts !== 'undefined' && typeof opts !== 'function' && opts.forceDelete) if(typeof opts !== 'undefined' && typeof opts !== 'function' && opts.forceDelete)
return exports.rmdirRecursive(newDir, function(err) { return exports.rmdirRecursive(newDir, function(err) {
copyDirRecursive.apply(this, originalArguments); copyDirRecursive.apply(this, originalArguments);
@ -407,18 +401,6 @@ exports.copyDirRecursive = function copyDirRecursive(srcDir, newDir, opts, clbk)
if(typeof opts === 'function') if(typeof opts === 'function')
clbk = opts; clbk = opts;
=======
if(typeof opts !== 'undefined' && typeof opts !== 'function' && opts.forceDelete)
return exports.rmdirRecursive(newDir, function(err){
copyDirRecursive.apply(this, arguments);
});
else
return clbk(new Error('You are trying to delete a directory that already exists. Specify forceDelete in an options object to override this.'));
}
if(typeof opts === 'function')
clbk = opts;
>>>>>>> 7827a700ff8cb8b742e401e9876e86a63ae0c68a
fs.stat(srcDir, function(err, srcDirStat){ fs.stat(srcDir, function(err, srcDirStat){
if (err) return clbk(err); if (err) return clbk(err);

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "wrench", "name": "wrench",
"description": "Recursive filesystem (and other) operations that Node *should* have.", "description": "Recursive filesystem (and other) operations that Node *should* have.",
"version": "1.5.3", "version": "1.5.4",
"author": "Ryan McGrath <ryan@venodesigns.net>", "author": "Ryan McGrath <ryan@venodesigns.net>",
"repository": { "repository": {