fix: should ignore broken symlinks

yandex · May 18, 2016 · f851122 · f851122
1 parent c854cdc
commit f851122
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 2 deletions.
diff --git a/lib/copy-file-stream.js b/lib/copy-file-stream.js
@@ -20,7 +20,13 @@ module.exports = class CopyFileStream extends stream.Writable {
 
         fs.stat(filename, (err, stats) => {
             if (err) {
-                return this.emit('error', err);
+                return fs.lstat(filename, lerr => {
+                    // file not found
+                    if (lerr) { return callback(err); }
+
+                    // ignore broken symlink
+                    callback();
+                });
             }
 
             if (stats.isDirectory() || !this._emptyFiles && stats.size === 0) {

diff --git a/lib/tar-stream.js b/lib/tar-stream.js
@@ -39,7 +39,13 @@ module.exports = class TarStream extends stream.Writable {
 
         fs.stat(filename, (err, stats) => {
             if (err) {
-                return this.emit('error', err);
+                return fs.lstat(filename, lerr => {
+                    // file not found
+                    if (lerr) { return callback(err); }
+
+                    // ignore broken symlink
+                    callback();
+                });
             }
 
             if (stats.isDirectory() || !this._emptyFiles && stats.size === 0) {

diff --git a/test/copy-file-stream.test.js b/test/copy-file-stream.test.js
@@ -117,6 +117,24 @@ test('should copy source file of symlink', t => {
         });
 });
 
+test('should ignore broken symlinks', t => {
+    mockFs({
+        'source-dir': {
+            'file-1.txt': 'Hi!',
+            'symlink.txt': mockFs.symlink({
+                path: 'no-file'
+            })
+        }
+    });
+
+    return copyFiles(['file-1.txt', 'symlink.txt'])
+        .then(() => {
+            const files = fs.readdirSync(path.join(dest, 'source-dir'));
+
+            t.deepEqual(files, ['file-1.txt']);
+        });
+});
+
 test('should ignore empty file', t => {
     mockFs({
         'source-dir': {

diff --git a/test/tar-stream.test.js b/test/tar-stream.test.js
@@ -101,6 +101,23 @@ test('should take into account symlink', t => {
         });
 });
 
+test('should ignore broken symlinks', t => {
+    mockFs({
+        'source-dir': {
+            'file-1.txt': 'Hi!',
+            'symlink.txt': mockFs.symlink({
+                path: '../no-file'
+            })
+        }
+    });
+
+    return packFiles(['file-1.txt', 'symlink.txt'])
+        .then(() => extractFiles())
+        .then(files => {
+            t.deepEqual(files, ['file-1.txt']);
+        });
+});
+
 test('should ignore empty file', t => {
     mockFs({
         'source-dir': {