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: nodejs#44598 (comment)
fahrradflucht · May 25, 2024 · d62cf9b · d62cf9b
1 parent 177b8b9
commit d62cf9b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/internal/fs/cp/cp-sync.js b/lib/internal/fs/cp/cp-sync.js
@@ -82,8 +82,8 @@ function checkPathsSync(src, dest, opts) {
     }
     if (srcStat.isDirectory() && !destStat.isDirectory()) {
       throw new ERR_FS_CP_DIR_TO_NON_DIR({
-        message: `cannot overwrite directory ${src} ` +
-          `with non-directory ${dest}`,
+        message: `cannot overwrite non-directory ${dest} ` +
+          `with directory ${src}`,
         path: dest,
         syscall: 'cp',
         errno: EISDIR,
@@ -92,8 +92,8 @@ function checkPathsSync(src, dest, opts) {
     }
     if (!srcStat.isDirectory() && destStat.isDirectory()) {
       throw new ERR_FS_CP_NON_DIR_TO_DIR({
-        message: `cannot overwrite non-directory ${src} ` +
-          `with directory ${dest}`,
+        message: `cannot overwrite directory ${dest} ` +
+          `with non-directory ${src}`,
         path: dest,
         syscall: 'cp',
         errno: ENOTDIR,

diff --git a/lib/internal/fs/cp/cp.js b/lib/internal/fs/cp/cp.js
@@ -86,8 +86,8 @@ async function checkPaths(src, dest, opts) {
     }
     if (srcStat.isDirectory() && !destStat.isDirectory()) {
       throw new ERR_FS_CP_DIR_TO_NON_DIR({
-        message: `cannot overwrite directory ${src} ` +
-            `with non-directory ${dest}`,
+        message: `cannot overwrite non-directory ${dest} ` +
+            `with directory ${src}`,
         path: dest,
         syscall: 'cp',
         errno: EISDIR,
@@ -96,8 +96,8 @@ async function checkPaths(src, dest, opts) {
     }
     if (!srcStat.isDirectory() && destStat.isDirectory()) {
       throw new ERR_FS_CP_NON_DIR_TO_DIR({
-        message: `cannot overwrite non-directory ${src} ` +
-            `with directory ${dest}`,
+        message: `cannot overwrite directory ${dest} ` +
+            `with non-directory ${src}`,
         path: dest,
         syscall: 'cp',
         errno: ENOTDIR,