From 752d0f62f077e9421434301618dd659cf5830297 Mon Sep 17 00:00:00 2001 From: Alex Kocharin Date: Mon, 31 Mar 2014 04:32:11 +0000 Subject: [PATCH] make fs-ext optional --- lib/local-fs.js | 11 ++++++++++- package.yaml | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/local-fs.js b/lib/local-fs.js index 59ed91fa2..678494b11 100644 --- a/lib/local-fs.js +++ b/lib/local-fs.js @@ -1,10 +1,19 @@ var fs = require('fs') - , fsExt = require('fs-ext') , Path = require('path') , mkdirp = require('mkdirp') , mystreams = require('./streams') , FSError = require('./error').FSError +try { + var fsExt = require('fs-ext') +} catch(e) { + fsExt = { + flock: function() { + arguments[arguments.length-1]() + } + } +} + function write(dest, data, cb) { var safe_write = function(cb) { var tmpname = dest + '.tmp' + String(Math.random()).substr(2) diff --git a/package.yaml b/package.yaml index b9c5b4e73..792cecf76 100644 --- a/package.yaml +++ b/package.yaml @@ -27,9 +27,11 @@ dependencies: semver: '>= 2.2.1' minimatch: '>= 0.2.14' bunyan: '>= 0.22.1' - fs-ext: '>= 0.3.2' mkdirp: '>= 0.3.5' +optionalDependencies: + fs-ext: '>= 0.3.2' + devDependencies: rimraf: '>= 2.2.5' mocha: '>= 1.17.0'