Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
fix #25924

(cherry picked from commit d0325006875b97e494779575f17b7634f6837bbe)
This commit is contained in:
Giteabot 2023-07-17 14:28:54 -04:00 committed by Earl Warren
parent 27a40aeb6b
commit d5c4f3430e
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/environment-to-ini/environment-to-ini.go
View file

@ -75,6 +75,8 @@ func main() {
} }
func runEnvironmentToIni(c *cli.Context) error { 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{ setting.InitWorkPathAndCfgProvider(os.Getenv, setting.ArgWorkPathAndCustomConf{
WorkPath: c.String("work-path"), WorkPath: c.String("work-path"),
CustomPath: c.String("custom-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) 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 // try to save the config file
destination := c.String("out") destination := c.String("out")