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
le='2008-07-08 16:01:52 +0200'>2008-07-08Updated German translationRené 'Necoro' Neumann2-1013/+994 2008-07-08Removed the USE_CATAPULT stuffRené 'Necoro' Neumann3-13/+6 2008-07-08Removed catapultRené 'Necoro' Neumann3-427/+0 2008-07-08Added the reload_portage pluginRené 'Necoro' Neumann1-1/+1 2008-07-08Added the reload_portage pluginRené 'Necoro' Neumann2-4/+36 2008-07-08Very basic documentationRené 'Necoro' Neumann1-57/+16 2008-07-08Documented the plugin moduleRené 'Necoro' Neumann2-32/+229 2008-07-04Ported remaining pluginsRené 'Necoro' Neumann6-89/+100 2008-07-04Removed lxml version in error stringRené 'Necoro' Neumann1-2/+1 2008-07-04Removed lxml version in error stringRené 'Necoro' Neumann1-3/+1 2008-07-04Ignore errors on plugin loadingRené 'Necoro' Neumann1-0/+6 2008-07-04Added ability to install missing plugin depsRené 'Necoro' Neumann3-95/+126 2008-07-04Fixed find_best_match for <portage-2.1.5René 'Necoro' Neumann1-2/+2 2008-07-04Some more dependency awarenessRené 'Necoro' Neumann5-23/+59 2008-07-03Some window refinementRené 'Necoro' Neumann1-109/+126 2008-07-03Removed XSD_LOCATION -- as there is no more xsd ;)René 'Necoro' Neumann2-5/+1 2008-07-03Updated setup.py to install the correct set of pluginsRené 'Necoro' Neumann1-3/+2 2008-07-03Ported etc-proposals pluginRené 'Necoro' Neumann3-50/+43 2008-07-03Ported gpytage pluginRené 'Necoro' Neumann2-16/+14 2008-07-03Ported Notify pluginRené 'Necoro' Neumann4-37/+51 2008-07-03Remove xsd and -x cmdline optionRené 'Necoro' Neumann2-107/+1 2008-07-03Ported completelyRené 'Necoro' Neumann3-548/+54 2008-07-03Should show dependencies nowRené 'Necoro' Neumann2-82/+128 2008-07-03Use __slots__ for the PkgData class to save memoryRené 'Necoro' Neumann1-2/+3 2008-07-03New plugin system - first hackRené 'Necoro' Neumann2-420/+683 2008-06-30Now the new design is able to do the same as the old oneRené 'Necoro' Neumann3-168/+182 2008-06-30First draft of the new plugin windowRené 'Necoro' Neumann1-8/+172 2008-06-30Added stuff to plugin.pyRené 'Necoro' Neumann1-2/+24 2008-06-30Beautified some dialogsRené 'Necoro' Neumann1-6/+8 2008-06-30Only add a package to mergequeue if everything went fineRené 'Necoro' Neumann1-1/+1 2008-06-26Removed '__find_resolved_unresolved' as it is quite useless.René 'Necoro' Neumann3-53/+29 2008-06-26Added very basic set queryingRené 'Necoro' Neumann3-0/+27 2008-06-25Now load 22 versions when running the correct portageRené 'Necoro' Neumann4-8/+18 2008-06-25Added Package_22 and System_22René 'Necoro' Neumann4-5/+63