Jira (PUP-9792) Merge of lookup_options not working

[Matt Dainty (JIRA)]

Title: Message Title

Matt Dainty commented on PUP-9792   Re: Merge of lookup_options not working Eventually I managed to unpick the multiple levels of caching and the following crude diff fixes the behaviour: diff --git a/lib/puppet/pops/lookup/lookup_adapter.rb b/lib/puppet/pops/lookup/lookup_adapter.rb index 4014aea..d531705 100644 --- a/lib/puppet/pops/lookup/lookup_adapter.rb +++ b/lib/puppet/pops/lookup/lookup_adapter.rb @@ -233,12 +233,12 @@ class LookupAdapter < DataAdapter module_name = key.module_name # Retrieve the options for the module. We use nil as a key in case we have no module - if !@lookup_options.include?(module_name) + #if !@lookup_options.include?(module_name) options = retrieve_lookup_options(module_name, lookup_invocation, MergeStrategy.strategy(HASH)) - @lookup_options[module_name] = options - else - options = @lookup_options[module_name] - end + # @lookup_options[module_name] = options + #else + # options = @lookup_options[module_name] + #end extract_lookup_options_for_key(key, options) end @@ -377,7 +377,7 @@ class LookupAdapter < DataAdapter # Retrieve and cache lookup options specific to the environment of the compiler that this adapter is attached to (i.e. a merge # of global and environment lookup options). def env_lookup_options(lookup_invocation, merge_strategy) - if !instance_variable_defined?(:@env_lookup_options) + #if !instance_variable_defined?(:@env_lookup_options) global_options = global_lookup_options(lookup_invocation, merge_strategy) @env_only_lookup_options = nil catch(:no_such_key) { @env_only_lookup_options = validate_lookup_options(lookup_in_environment(LookupKey::LOOKUP_OPTIONS, lookup_invocation, merge_strategy), nil) } @@ -388,7 +388,7 @@ class LookupAdapter < DataAdapter else @env_lookup_options = merge_strategy.merge(global_options, @env_only_lookup_options) end - end + #end @env_lookup_options end Would a tidied up PR be acceptable? Add Comment   This message was sent by Atlassian JIRA (v7.7.1#77002-sha1:e75ca93) -- You received this message because you are subscribed to the Google Groups "Puppet Bugs" group. To unsubscribe from this group and stop receiving emails from it, send an email to puppet-bugs+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/puppet-bugs/JIRA.313541.1561115342000.100962.1568712600188%40Atlassian.JIRA.