Commit f00ee1c
fs: fix cp dir/non-dir mismatch error messages
The error messages for `ERR_FS_CP_DIR_TO_NON_DIR` and
`ERR_FS_CP_NON_DIR_TO_DIR` were the inverse of the copy direction
actually performed.
Refs: #44598 (comment)
PR-URL: #53150
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Feng Yu <F3n67u@outlook.com>1 parent b081bc7 commit f00ee1c
3 files changed
Lines changed: 10 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1209,12 +1209,12 @@ E('ERR_FEATURE_UNAVAILABLE_ON_PLATFORM', | |||
| 1209 | 1209 | ', which is being used to run Node.js', | |
| 1210 | 1210 | TypeError); | |
| 1211 | 1211 | E('ERR_FS_CP_DIR_TO_NON_DIR', | |
| 1212 | - 'Cannot overwrite directory with non-directory', SystemError); | ||
| 1212 | + 'Cannot overwrite non-directory with directory', SystemError); | ||
| 1213 | 1213 | E('ERR_FS_CP_EEXIST', 'Target already exists', SystemError); | |
| 1214 | 1214 | E('ERR_FS_CP_EINVAL', 'Invalid src or dest', SystemError); | |
| 1215 | 1215 | E('ERR_FS_CP_FIFO_PIPE', 'Cannot copy a FIFO pipe', SystemError); | |
| 1216 | 1216 | E('ERR_FS_CP_NON_DIR_TO_DIR', | |
| 1217 | - 'Cannot overwrite non-directory with directory', SystemError); | ||
| 1217 | + 'Cannot overwrite directory with non-directory', SystemError); | ||
| 1218 | 1218 | E('ERR_FS_CP_SOCKET', 'Cannot copy a socket file', SystemError); | |
| 1219 | 1219 | E('ERR_FS_CP_SYMLINK_TO_SUBDIRECTORY', | |
| 1220 | 1220 | 'Cannot overwrite symlink in subdirectory of self', SystemError); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -83,8 +83,8 @@ function checkPathsSync(src, dest, opts) { | |||
| 83 | 83 | } | |
| 84 | 84 | if (srcStat.isDirectory() && !destStat.isDirectory()) { | |
| 85 | 85 | throw new ERR_FS_CP_DIR_TO_NON_DIR({ | |
| 86 | - message: `cannot overwrite directory ${src} ` + | ||
| 87 | - `with non-directory ${dest}`, | ||
| 86 | + message: `cannot overwrite non-directory ${dest} ` + | ||
| 87 | + `with directory ${src}`, | ||
| 88 | 88 | path: dest, | |
| 89 | 89 | syscall: 'cp', | |
| 90 | 90 | errno: EISDIR, | |
@@ -93,8 +93,8 @@ function checkPathsSync(src, dest, opts) { | |||
| 93 | 93 | } | |
| 94 | 94 | if (!srcStat.isDirectory() && destStat.isDirectory()) { | |
| 95 | 95 | throw new ERR_FS_CP_NON_DIR_TO_DIR({ | |
| 96 | - message: `cannot overwrite non-directory ${src} ` + | ||
| 97 | - `with directory ${dest}`, | ||
| 96 | + message: `cannot overwrite directory ${dest} ` + | ||
| 97 | + `with non-directory ${src}`, | ||
| 98 | 98 | path: dest, | |
| 99 | 99 | syscall: 'cp', | |
| 100 | 100 | errno: ENOTDIR, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -86,8 +86,8 @@ async function checkPaths(src, dest, opts) { | |||
| 86 | 86 | } | |
| 87 | 87 | if (srcStat.isDirectory() && !destStat.isDirectory()) { | |
| 88 | 88 | throw new ERR_FS_CP_DIR_TO_NON_DIR({ | |
| 89 | - message: `cannot overwrite directory ${src} ` + | ||
| 90 | - `with non-directory ${dest}`, | ||
| 89 | + message: `cannot overwrite non-directory ${dest} ` + | ||
| 90 | + `with directory ${src}`, | ||
| 91 | 91 | path: dest, | |
| 92 | 92 | syscall: 'cp', | |
| 93 | 93 | errno: EISDIR, | |
@@ -96,8 +96,8 @@ async function checkPaths(src, dest, opts) { | |||
| 96 | 96 | } | |
| 97 | 97 | if (!srcStat.isDirectory() && destStat.isDirectory()) { | |
| 98 | 98 | throw new ERR_FS_CP_NON_DIR_TO_DIR({ | |
| 99 | - message: `cannot overwrite non-directory ${src} ` + | ||
| 100 | - `with directory ${dest}`, | ||
| 99 | + message: `cannot overwrite directory ${dest} ` + | ||
| 100 | + `with non-directory ${src}`, | ||
| 101 | 101 | path: dest, | |
| 102 | 102 | syscall: 'cp', | |
| 103 | 103 | errno: ENOTDIR, | |
0 commit comments