From 500ea2020f95f8e96663f4a56d43be62819ef929 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 28 Jan 2009 12:26:03 -0600 Subject: Fixing #1914 - 'undef' relationship metaparameters do not stack This allows you to specify that a metaparameter is undef inside a definition and keep any parameters from being inherited from the parent. Signed-off-by: Luke Kanies --- lib/puppet/parser/resource.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/puppet/parser/resource.rb') diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index 12c1a8f52..fef0b54ca 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -352,6 +352,7 @@ class Puppet::Parser::Resource # LAK:NOTE Relationship metaparams get treated specially -- we stack them, instead of # overriding. next if @params[name] and not self.class.relationship_parameter?(name) + next if @params[name] and @params[name].value == :undef # Skip metaparams for which we get no value. next unless val = scope.lookupvar(name.to_s, false) and val != :undefined -- cgit