diff --git a/package-lock.json b/package-lock.json index 5ad9cc298..662df8973 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5940,8 +5940,8 @@ } }, "tar-fs": { - "version": "github:cloudron-io/tar-fs#c941c1e364f5345686f92656238a1f8ce67232f3", - "from": "github:cloudron-io/tar-fs#ignore_file_removed", + "version": "github:cloudron-io/tar-fs#08e18e67201e352697251fe98c816c9d2afddd38", + "from": "github:cloudron-io/tar-fs#ignore_stat_error", "requires": { "chownr": "^1.1.1", "mkdirp": "^0.5.1", diff --git a/package.json b/package.json index 734aaa978..450e5c418 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "split": "^1.0.1", "superagent": "^4.1.0", "supererror": "^0.7.2", - "tar-fs": "github:cloudron-io/tar-fs#ignore_file_removed", + "tar-fs": "github:cloudron-io/tar-fs#ignore_stat_error", "tar-stream": "^2.0.1", "tldjs": "^2.3.1", "underscore": "^1.9.1", diff --git a/src/backups.js b/src/backups.js index 3d3bb266e..3d1aec71b 100644 --- a/src/backups.js +++ b/src/backups.js @@ -286,9 +286,9 @@ function tarPack(dataLayout, key, callback) { var pack = tar.pack('/', { dereference: false, // pack the symlink and not what it points to entries: dataLayout.localPaths(), - ignoreFileRemoved: (path, err) => { - debug(`tarPack: ${path} got removed (${err.code}). ignoring`); - return true; + ignoreStatError: (path, err) => { + debug(`tarPack: error stat'ing ${path} - ${err.code}`); + return err.code === 'ENOENT'; // ignore if file or dir got removed (probably some temporary file) }, map: function(header) { header.name = dataLayout.toRemotePath(header.name);