diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-28 14:44:39 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-28 14:44:39 -0600 |
| commit | fe1f4f57bf5ee0792ee645ec8e0bfddf455ea1e3 (patch) | |
| tree | ad62c32acd6fa7fb22a7025866d43eaea688f673 /lib/puppet/parser/ast/hostclass.rb | |
| parent | dd17d4ca71e17deba8cf19e376e2d711fa516d92 (diff) | |
| parent | c0b5352851d3fdef20b2a432f6f06d31fdc9ce99 (diff) | |
| download | puppet-fe1f4f57bf5ee0792ee645ec8e0bfddf455ea1e3.tar.gz puppet-fe1f4f57bf5ee0792ee645ec8e0bfddf455ea1e3.tar.xz puppet-fe1f4f57bf5ee0792ee645ec8e0bfddf455ea1e3.zip | |
Merge branch '0.24.x' of ssh://reductivelabs.com/opt/rl/git/puppet into 0.24.x
Diffstat (limited to 'lib/puppet/parser/ast/hostclass.rb')
| -rw-r--r-- | lib/puppet/parser/ast/hostclass.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/puppet/parser/ast/hostclass.rb b/lib/puppet/parser/ast/hostclass.rb index 8d4d01660..7f89f8151 100644 --- a/lib/puppet/parser/ast/hostclass.rb +++ b/lib/puppet/parser/ast/hostclass.rb @@ -21,7 +21,14 @@ class Puppet::Parser::AST::HostClass < Puppet::Parser::AST::Definition # Make sure our parent class has been evaluated, if we have one. def evaluate(scope) if parentclass and ! scope.catalog.resource(self.class.name, parentclass) - resource = parentobj.evaluate(scope) + parent_resource = parentobj.evaluate(scope) + end + + # Do nothing if the resource already exists; this makes sure we don't + # get multiple copies of the class resource, which helps provide the + # singleton nature of classes. + if resource = scope.catalog.resource(self.class.name, self.classname) + return resource end super |