From 2cb2fc4805060986c6d5cdf6b7636d91b441c38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Nison?= <nison.mael@gmail.com>
Date: Mon, 24 Feb 2020 19:37:01 +0100
Subject: [PATCH] Makes the CLI 2 forwarding stricter (#7931)

* Makes the CLI 2 forwarding stricter

* Fixes a test
---
 src/cli/commands/policies.js |  2 +-
 src/lockfile/parse.js        | 23 +++++++++++++++--------
 src/rc.js                    |  4 ++--
 src/util/rc.js               |  6 +++++-
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/cli/commands/policies.js b/src/cli/commands/policies.js
index 037121caf2..79a11dd57a 100644
--- a/src/cli/commands/policies.js
+++ b/src/cli/commands/policies.js
@@ -167,7 +167,7 @@ const {run, setFlags, examples} = buildSubCommands('policies', {
       const rcPath = `${config.lockfileFolder}/.yarnrc.yml`;
       reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
 
-      await fs.writeFilePreservingEol(rcPath, `yarnPath: ${JSON.stringify(yarnPath)}\n`);
+      await fs.writeFilePreservingEol(rcPath, `yarnPath: ${JSON.stringify(targetPath)}\n`);
     } else {
       const rcPath = `${config.lockfileFolder}/.yarnrc`;
       reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
diff --git a/src/lockfile/parse.js b/src/lockfile/parse.js
index d5c089c9c6..14eaaa1a5a 100644
--- a/src/lockfile/parse.js
+++ b/src/lockfile/parse.js
@@ -384,16 +384,23 @@ function hasMergeConflicts(str: string): boolean {
 function parse(str: string, fileLoc: string): Object {
   const parser = new Parser(str, fileLoc);
   parser.next();
-  try {
-    return parser.parse();
-  } catch (error1) {
+
+  if (!fileLoc.endsWith(`.yml`)) {
     try {
-      return safeLoad(str, {
-        schema: FAILSAFE_SCHEMA,
-      });
-    } catch (error2) {
-      throw error1;
+      return parser.parse();
+    } catch (error1) {
+      try {
+        return safeLoad(str, {
+          schema: FAILSAFE_SCHEMA,
+        });
+      } catch (error2) {
+        throw error1;
+      }
     }
+  } else {
+    return safeLoad(str, {
+      schema: FAILSAFE_SCHEMA,
+    });
   }
 }
 
diff --git a/src/rc.js b/src/rc.js
index 973d86d714..c8f48131c0 100644
--- a/src/rc.js
+++ b/src/rc.js
@@ -53,9 +53,9 @@ export function getRcConfigForFolder(cwd: string): {[key: string]: string} {
 }
 
 function loadRcFile(fileText: string, filePath: string): {[key: string]: string} {
-  let {object: values} = parse(fileText, 'yarnrc');
+  let {object: values} = parse(fileText, filePath);
 
-  if (filePath.match(/\.yml$/)) {
+  if (filePath.match(/\.yml$/) && typeof values.yarnPath === 'string') {
     values = {'yarn-path': values.yarnPath};
   }
 
diff --git a/src/util/rc.js b/src/util/rc.js
index 4be6cbba21..2e167ca214 100644
--- a/src/util/rc.js
+++ b/src/util/rc.js
@@ -68,7 +68,11 @@ function parseRcPaths(paths: Array<string>, parser: Function): Object {
       try {
         return parser(readFileSync(path).toString(), path);
       } catch (error) {
-        return {};
+        if (error.code === 'ENOENT' || error.code === 'EISDIR') {
+          return {};
+        } else {
+          throw error;
+        }
       }
     }),
   );