From 953101bf15f420e928f64b84f3967caabebd4a33 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 16 Sep 2020 16:34:18 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20don=E2=80=99t=20force=20cli=20token=20or?=
=?UTF-8?q?=20hostRules=20(#7303)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #7298
---
lib/config/index.ts | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/config/index.ts b/lib/config/index.ts
index ecf675a8f0..0f4699091c 100644
--- a/lib/config/index.ts
+++ b/lib/config/index.ts
@@ -65,10 +65,13 @@ export async function parseConfigs(
}
if (config.forceCli) {
+ const forcedCli = { ...cliConfig };
+ delete forcedCli.token;
+ delete forcedCli.hostRules;
if (config.force) {
- config.force = Object.assign(config.force, { ...cliConfig });
+ config.force = Object.assign(config.force, forcedCli);
} else {
- config.force = { ...cliConfig };
+ config.force = forcedCli;
}
}
--
GitLab