diff options
| author | Giteabot <teabot@gitea.io> | 2023-06-24 10:04:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-24 14:04:50 +0000 |
| commit | 71d2a6a41a7fea7a71efa125f47567b5cb5ba56a (patch) | |
| tree | 97b93375c0e3702ce3f4cbcb84c7c99bdf9d4600 /contrib | |
| parent | d1f1f1142ed6fd58e521587454a36827c320a5f6 (diff) | |
| download | gitea-1.20.0-rc2.tar.gz gitea-1.20.0-rc2.zip | |
Use InitWorkPathAndCfgProvider for environment-to-ini to avoid unnecessary checks (#25480) (#25488)v1.20.0-rc2
Backport #25480 by @wxiaoguang
Fix #25481
The `InitWorkPathAndCommonConfig` calls `LoadCommonSettings` which does
many checks like "current user is root or not".
Some commands like "environment-to-ini" shouldn't do such check, because
it might be run with "root" user at the moment (eg: the docker's setup
script)
ps: in the future, the docker's setup script should be improved to avoid
Gitea's command running with "root"
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/environment-to-ini/environment-to-ini.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/environment-to-ini/environment-to-ini.go b/contrib/environment-to-ini/environment-to-ini.go index 2cdf4e3943..230ed58269 100644 --- a/contrib/environment-to-ini/environment-to-ini.go +++ b/contrib/environment-to-ini/environment-to-ini.go @@ -88,7 +88,7 @@ func main() { } func runEnvironmentToIni(c *cli.Context) error { - setting.InitWorkPathAndCommonConfig(os.Getenv, setting.ArgWorkPathAndCustomConf{ + setting.InitWorkPathAndCfgProvider(os.Getenv, setting.ArgWorkPathAndCustomConf{ WorkPath: c.String("work-path"), CustomPath: c.String("custom-path"), CustomConf: c.String("config"), |