diff options
author | Jesse Wolfe <jes5199@gmail.com> | 2010-09-13 22:57:48 -0700 |
---|---|---|
committer | Jesse Wolfe <jes5199@gmail.com> | 2010-09-13 22:57:48 -0700 |
commit | 754ed19a8105a1be01c723a91abf9999ec6a8ab3 (patch) | |
tree | 8a3b59432ff56fbaf64d1cb6448e4e228f5359c0 /lib/puppet/parser/compiler.rb | |
parent | 21afb51a1b84116b2a906a6959ae588f45135104 (diff) | |
parent | efa834aaec596b0d5e7b314a53e6b258ce44728c (diff) | |
download | puppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.tar.gz puppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.tar.xz puppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.zip |
Merge commit '2.6.1rc4'
Diffstat (limited to 'lib/puppet/parser/compiler.rb')
-rw-r--r-- | lib/puppet/parser/compiler.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb index 7504b276b..e1227e753 100644 --- a/lib/puppet/parser/compiler.rb +++ b/lib/puppet/parser/compiler.rb @@ -71,7 +71,7 @@ class Puppet::Parser::Compiler raise ArgumentError, "Could not find stage #{resource[:stage] || :main} specified by #{resource}" end - resource[:stage] ||= stage.title + resource[:stage] ||= stage.title unless stage.title == :main @catalog.add_edge(stage, resource) end |