Fixing a failing test from my fix for #446 -- I had changed

the behaviour of Resource#override_parameter unintentionally.
I've corrected the comments so it's clear why the original behaviour
was there.

1 files changed, 5 insertions, 6 deletions

diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb
index ea0f93f57..2f7fff13f 100644
--- a/lib/puppet/parser/resource.rb
+++ b/lib/puppet/parser/resource.rb
@@ -403,12 +403,11 @@ class Puppet::Parser::Resource
         # If we've gotten this far, we're allowed to override.
 
         # Merge with previous value, if the parameter was generated with the +> syntax.
-        if param.add
-            current.value = [current.value, param.value].flatten
-        else
-            # Just replace the existing parameter with this new one.
-            @params[param.name] = param
-        end
+        # It's important that we use the new param instance here, not the old one,
+        # so that the source is registered correctly for later overrides.
+        param.value = [current.value, param.value].flatten if param.add
+
+        @params[param.name] = param
     end
 
     # Verify that all passed parameters are valid.  This throws an error if