aboutsummaryrefslogtreecommitdiff
path: root/pkg/config/yaml.go
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--pkg/config/yaml.go8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkg/config/yaml.go b/pkg/config/yaml.go
index e8dc401..1afba0a 100644
--- a/pkg/config/yaml.go
+++ b/pkg/config/yaml.go
@@ -86,10 +86,10 @@ func (cfg *Config) fixGlobalOptions(unparsed Map) {
newOpts, _ := buildOptions(&cfg.FeedOptions, unparsed)
- for k := range origMap {
+ for k, v := range origMap {
if _, ok := unparsed[k]; !ok {
log.Warnf("Global option '%s' should be inside the 'options' map. It currently overwrites the same key there.", k)
- } else {
+ } else if !handleDeprecated(k, v, "", &cfg.GlobalOptions, &newOpts) {
log.Warnf("Unknown global option '%s'. Ignored!", k)
}
}
@@ -199,7 +199,9 @@ func buildFeeds(cfg []configGroupFeed, target []string, feeds Feeds, globalFeedO
opt, unknown := buildOptions(globalFeedOptions, f.Options)
for _, optName := range unknown {
- log.Warnf("Unknown option '%s' for feed '%s'. Ignored!", optName, name)
+ if !handleDeprecated(optName, f.Options[optName], name, nil, &opt) {
+ log.Warnf("Unknown option '%s' for feed '%s'. Ignored!", optName, name)
+ }
}
feedCopy.Options = opt
ss='insertions'>+20 2008-03-19Make logger thread-safeRené 'Necoro' Neumann1-3/+6 2008-03-18Fixed new_use_flag creation errorRené 'Necoro' Neumann1-3/+3 2008-03-18keep i18n up2dateRené 'Necoro' Neumann3-326/+366 2008-03-18corrected header commentRené 'Necoro' Neumann1-2/+2 2008-03-18Removed gtk subdirRené 'Necoro' Neumann21-134/+79 2008-03-18Removed wrapperRené 'Necoro' Neumann2-238/+184 2008-03-18Split and renamed gui_helperRené 'Necoro' Neumann4-249/+266 2008-03-18Splitted windows.pyRené 'Necoro' Neumann10-424/+549 2008-03-12Moved get_dependencies to top package classRené 'Necoro' Neumann4-50/+85 2008-03-11improved performance by caching the use_expand queriesRené 'Necoro' Neumann1-5/+14 2008-03-11use catapult varsRené 'Necoro' Neumann2-4/+6 2008-03-11Updated catapult stuffRené 'Necoro' Neumann5-56/+108 2008-03-10Generate correct KeyNotFoundExceptionRené 'Necoro' Neumann1-2/+2 2008-03-09Small changesRené 'Necoro' Neumann3-1/+4 2008-03-07Better session handlingRené 'Necoro' Neumann1-5/+54 2008-03-07Small changesRené 'Necoro' Neumann1-1/+4 2008-03-07Updated shm module to 1.2René 'Necoro' Neumann1-8/+21 2008-03-07Update TODORené 'Necoro' Neumann1-3/+1 2008-03-07hmm ... yesRené 'Necoro' Neumann1-1/+1 2008-03-06Used better exceptions for configuration parserRené 'Necoro' Neumann1-26/+114 2008-03-06Update translationRené 'Necoro' Neumann2-349/+393 2008-03-06Update createpot.shRené 'Necoro' Neumann1-3/+2 2008-03-06Use 'nofork' instead of 'nolistener'René 'Necoro' Neumann1-3/+3 2008-03-05Install glade files into template dir and not data dirRené 'Necoro' Neumann2-2/+1 2008-03-05Added dependency listRené 'Necoro' Neumann3-117/+237