diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-04-20 15:55:29 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-04-20 15:55:29 -0700 |
| commit | 0b9c7adce13cad4325d514f9d97562364042319c (patch) | |
| tree | f772da027951451763c75cff95426ab8fcb08991 /lib/puppet | |
| parent | 6b18f8f01f12b6123f3c7eae58817b10d41b2391 (diff) | |
| parent | 34f9f41628273d1554760f85414eb326aaea605e (diff) | |
| download | puppet-0b9c7adce13cad4325d514f9d97562364042319c.tar.gz puppet-0b9c7adce13cad4325d514f9d97562364042319c.tar.xz puppet-0b9c7adce13cad4325d514f9d97562364042319c.zip | |
Merge branch 'maint/2.6.next/defined_type_has_two_parents' into 2.6.next
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/parser/resource.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index b98bc0b80..e4f913013 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -66,6 +66,8 @@ class Puppet::Parser::Resource < Puppet::Resource # is drawn from the class to the stage. The stage for containment # defaults to main, if none is specified. def add_edge_to_stage + return unless self.type.to_s.downcase == "class" + unless stage = catalog.resource(:stage, self[:stage] || (scope && scope.resource && scope.resource[:stage]) || :main) raise ArgumentError, "Could not find stage #{self[:stage] || :main} specified by #{self}" end |