diff options
| author | zeripath <art27@cantab.net> | 2020-09-10 22:32:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 16:32:58 -0500 |
| commit | daefdd1385d12bf0c8321f291dbb6ab242b41c99 (patch) | |
| tree | 57f4663361f318c12a9ad569d7fdde5d3bf7873c /vendor/gopkg.in | |
| parent | 47289344e2ede03b7a74208aad3b92c8bca979c3 (diff) | |
| download | gitea-daefdd1385d12bf0c8321f291dbb6ab242b41c99.tar.gz gitea-daefdd1385d12bf0c8321f291dbb6ab242b41c99.zip | |
Update gitea.com/macaron/i18n (#12806)
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'vendor/gopkg.in')
| -rw-r--r-- | vendor/gopkg.in/ini.v1/file.go | 3 | ||||
| -rw-r--r-- | vendor/gopkg.in/ini.v1/ini.go | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/vendor/gopkg.in/ini.v1/file.go b/vendor/gopkg.in/ini.v1/file.go index 7eecacaf2b..549c00a807 100644 --- a/vendor/gopkg.in/ini.v1/file.go +++ b/vendor/gopkg.in/ini.v1/file.go @@ -302,6 +302,9 @@ func (f *File) Reload() (err error) { } return err } + if f.options.ShortCircuit { + return nil + } } return nil } diff --git a/vendor/gopkg.in/ini.v1/ini.go b/vendor/gopkg.in/ini.v1/ini.go index 80ebf3ad69..96322b3041 100644 --- a/vendor/gopkg.in/ini.v1/ini.go +++ b/vendor/gopkg.in/ini.v1/ini.go @@ -81,6 +81,8 @@ type LoadOptions struct { IgnoreInlineComment bool // SkipUnrecognizableLines indicates whether to skip unrecognizable lines that do not conform to key/value pairs. SkipUnrecognizableLines bool + // ShortCircuit indicates whether to ignore other configuration sources after loaded the first available configuration source. + ShortCircuit bool // AllowBooleanKeys indicates whether to allow boolean type keys or treat as value is missing. // This type of keys are mostly used in my.cnf. AllowBooleanKeys bool |