diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-04-20 15:51:13 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-04-20 15:51:13 -0700 |
| commit | 06b8e7608eb8526396728020cd31f5c8052e21a3 (patch) | |
| tree | 03a31be33a5bee06e42a1fae000947da881c0232 /lib/puppet/parser | |
| parent | cb43cfc853249015ebea9e5be2091235c1e38b89 (diff) | |
| parent | 6981ee5f526e00f46f6b5460662bf09cddf832ef (diff) | |
Merge branch 'maint/defined_type_has_two_parents' into next
Diffstat (limited to 'lib/puppet/parser')
| -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 cd0e8c742..3bb5f8601 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 |