diff options
| author | Luke Kanies <luke@madstop.com> | 2008-01-07 12:19:21 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-01-07 12:19:21 -0600 |
| commit | 927dff41df8f1c236c54eaee9fa1db7a3efaf02a (patch) | |
| tree | efa1e512c63104b0ea32c208e751860d44a3b431 /lib/puppet/parser/compile.rb | |
| parent | 117926c92c8bdf2a45724c0ae758586f5ae23979 (diff) | |
| download | puppet-927dff41df8f1c236c54eaee9fa1db7a3efaf02a.tar.gz puppet-927dff41df8f1c236c54eaee9fa1db7a3efaf02a.tar.xz puppet-927dff41df8f1c236c54eaee9fa1db7a3efaf02a.zip | |
Fixing #971 -- classes can once again be included multiple
times.
Diffstat (limited to 'lib/puppet/parser/compile.rb')
| -rw-r--r-- | lib/puppet/parser/compile.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/parser/compile.rb b/lib/puppet/parser/compile.rb index fdd0cbcf2..c065e3f38 100644 --- a/lib/puppet/parser/compile.rb +++ b/lib/puppet/parser/compile.rb @@ -122,9 +122,12 @@ class Puppet::Parser::Compile classes.each do |name| # If we can find the class, then make a resource that will evaluate it. if klass = scope.findclass(name) + found << name and next if class_scope(klass) + # Create a resource to model this class, and then add it to the list # of resources. resource = Puppet::Parser::Resource.new(:type => "class", :title => klass.classname, :scope => scope, :source => scope.source) + store_resource(scope, resource) # If they've disabled lazy evaluation (which the :include function does), |