OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2026-01-15 12:15:26 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fs: simplify validateRmOptions() error handling

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/35567
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>
This commit is contained in:
cjihrig
2020-10-08 21:30:15 -04:00
parent 278d38f4cf
commit 94b0908503
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/internal/fs/utils.js
View File

@@ -684,17 +684,13 @@ const validateRmOptions = hideStackFrames((path, options, callback) => {
);
lazyLoadFs().stat(path, (err, stats) => {
if (err && err.code === 'ENOENT') {
if (options.force) {
if (err) {
if (options.force && err.code === 'ENOENT') {
return callback(null, options);
}
return callback(err, options);
}
if (err) {
return callback(err);
}
if (stats.isDirectory() && !options.recursive) {
return callback(new ERR_FS_EISDIR({
code: 'EISDIR',