From d5c4f3430e3b1629a2c98bac613f1096cf1fd79d Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 17 Jul 2023 14:28:54 -0400 Subject: [PATCH] Make environment-to-ini work with INSTALL_LOCK=true (#25926) (#25937) Co-authored-by: wxiaoguang fix #25924 (cherry picked from commit d0325006875b97e494779575f17b7634f6837bbe) --- contrib/environment-to-ini/environment-to-ini.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/environment-to-ini/environment-to-ini.go b/contrib/environment-to-ini/environment-to-ini.go index 057c19bf8..c5f997281 100644 --- a/contrib/environment-to-ini/environment-to-ini.go +++ b/contrib/environment-to-ini/environment-to-ini.go @@ -75,6 +75,8 @@ func main() { } func runEnvironmentToIni(c *cli.Context) error { + // the config system may change the environment variables, so get a copy first, to be used later + env := append([]string{}, os.Environ()...) setting.InitWorkPathAndCfgProvider(os.Getenv, setting.ArgWorkPathAndCustomConf{ WorkPath: c.String("work-path"), CustomPath: c.String("custom-path"), @@ -86,7 +88,7 @@ func runEnvironmentToIni(c *cli.Context) error { log.Fatal("Failed to load custom conf '%s': %v", setting.CustomConf, err) } - changed := setting.EnvironmentToConfig(cfg, os.Environ()) + changed := setting.EnvironmentToConfig(cfg, env) // try to save the config file destination := c.String("out")