aboutsummaryrefslogtreecommitdiff
path: root/pkg/config
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.eu>2022-01-08 20:03:36 +0100
committerRené 'Necoro' Neumann <necoro@necoro.eu>2022-01-08 20:03:36 +0100
commit180aa45d40e5d58d579fcaba44b94bcb8e3e08be (patch)
treee3a85c8e93da07aa97fcfaedd0f4d1add5e20401 /pkg/config
parent8bbd94713d8b4a1e4a0a28aa26841d836dd25aab (diff)
downloadfeed2imap-go-180aa45d40e5d58d579fcaba44b94bcb8e3e08be.tar.gz
feed2imap-go-180aa45d40e5d58d579fcaba44b94bcb8e3e08be.tar.bz2
feed2imap-go-180aa45d40e5d58d579fcaba44b94bcb8e3e08be.zip
Fix configuration parsing, when the target field is not of a primitive type.
Diffstat (limited to 'pkg/config')
-rw-r--r--pkg/config/yaml.go10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkg/config/yaml.go b/pkg/config/yaml.go
index ad1acf7..a80c80d 100644
--- a/pkg/config/yaml.go
+++ b/pkg/config/yaml.go
@@ -150,7 +150,7 @@ func buildOptions(globalFeedOptions *Options, options Map) (feedOptions Options,
n := gv.NumField()
for i := 0; i < n; i++ {
- val := fv.Field(i)
+ field := fv.Field(i)
f := fv.Type().Field(i)
if f.PkgPath != "" && !f.Anonymous {
@@ -166,10 +166,14 @@ func buildOptions(globalFeedOptions *Options, options Map) (feedOptions Options,
set, ok := options[name]
if ok { // in the map -> copy and delete
- val.Set(reflect.ValueOf(set))
+ value := reflect.ValueOf(set)
+ if !value.Type().AssignableTo(field.Type()) {
+ value = value.Convert(field.Type())
+ }
+ field.Set(value)
delete(options, name)
} else { // not in the map -> copy from global
- val.Set(gv.Field(i))
+ field.Set(gv.Field(i))
}
}
nomsgnecoro1-1/+0 2007-04-18finished Qt-Frontendnecoro5-15/+117 2007-04-17marking installed packages in pkglistnecoro5-14/+50 2007-04-16added ebuild window for Qt-Frontendnecoro4-2/+229 2007-04-16added preferences for Qt-Frontendnecoro9-279/+710 2007-04-13Improved masking display and made most of the Qt-Frontend worknecoro7-35/+334 2007-04-10Some more functionality for the Qt-Frontend (complete emerge)necoro8-217/+347 2007-04-07Some more functionality for the Qt-Frontendnecoro11-88/+463 2007-04-07Added Qt-Terminalnecoro4-4/+213 2007-04-06First qt draftnecoro6-1/+796 2007-04-04showed masked packages unmasked by the user similar to stable marked testing ...necoro5-13/+40 2007-03-31changed changelognecoro1-1/+2 2007-03-31Some small changes for etcproposals 1.1necoro1-2/+2 2007-03-31Some small changes for etcproposals 1.1necoro2-3/+3 2007-03-31Some small changes for etcproposals 1.1necoro1-6/+13 2007-03-31Allowed Plugins to have a menunecoro7-201/+315 2007-03-15Added etc-proposals pluginnecoro7-28/+121 2007-03-10Added USE_EXPAND-supportnecoro5-11/+63 2007-03-10Added plugin-data to about-dialognecoro3-197/+264