diff options
Diffstat (limited to 'lib/puppet/parser/compiler.rb')
| -rw-r--r-- | lib/puppet/parser/compiler.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb index a2186b2c9..121dae1b1 100644 --- a/lib/puppet/parser/compiler.rb +++ b/lib/puppet/parser/compiler.rb @@ -61,9 +61,7 @@ class Puppet::Parser::Compiler return if resource.type.to_s.downcase == "stage" if resource.type.to_s.downcase != "class" - if resource[:stage] - raise ArgumentError, "Only classes can set 'stage'; normal resources like #{resource} cannot change run stage" - end + raise ArgumentError, "Only classes can set 'stage'; normal resources like #{resource} cannot change run stage" if resource[:stage] return @catalog.add_edge(scope.resource, resource) end @@ -142,9 +140,7 @@ class Puppet::Parser::Compiler # creates resource objects that point back to the classes, and then the # resources are themselves evaluated later in the process. def evaluate_classes(classes, scope, lazy_evaluate = true) - unless scope.source - raise Puppet::DevError, "No source for scope passed to evaluate_classes" - end + raise Puppet::DevError, "No source for scope passed to evaluate_classes" unless scope.source found = [] classes.each do |name| # If we can find the class, then make a resource that will evaluate it. @@ -354,9 +350,7 @@ class Puppet::Parser::Compiler end end - unless remaining.empty? - raise Puppet::ParseError, "Failed to realize virtual resources #{remaining.join(', ')}" - end + raise Puppet::ParseError, "Failed to realize virtual resources #{remaining.join(', ')}" unless remaining.empty? end # Make sure all of our resources and such have done any last work |