Make environment-to-ini work with INSTALL_LOCK=true (#25926) (#25937)

GiteaBot · wxiaoguang · web-flow · commit d0325006875b · 2023-07-17T18:28:54.000Z
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> fix #25924
diff --git 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")

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ func main() {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`func runEnvironmentToIni(c *cli.Context) error {`
	`78`	`+ // the config system may change the environment variables, so get a copy first, to be used later`
	`79`	`+ env := append([]string{}, os.Environ()...)`
`78`	`80`	`setting.InitWorkPathAndCfgProvider(os.Getenv, setting.ArgWorkPathAndCustomConf{`
`79`	`81`	`WorkPath: c.String("work-path"),`
`80`	`82`	`CustomPath: c.String("custom-path"),`
`@@ -86,7 +88,7 @@ func runEnvironmentToIni(c *cli.Context) error {`
`86`	`88`	`log.Fatal("Failed to load custom conf '%s': %v", setting.CustomConf, err)`
`87`	`89`	`}`
`88`	`90`
`89`		`- changed := setting.EnvironmentToConfig(cfg, os.Environ())`
	`91`	`+ changed := setting.EnvironmentToConfig(cfg, env)`
`90`	`92`
`91`	`93`	`// try to save the config file`
`92`	`94`	`destination := c.String("out")`