diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-09-13 23:00:35 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-09-13 23:00:35 -0700 |
| commit | 9e72ccd8ff087d0cf4a1396401e3843311b4e6d4 (patch) | |
| tree | 19f55c6cb37bfd9bc39f0bf9060643ac61005415 /lib/puppet/parser/compiler.rb | |
| parent | 1d93c4dd86181eb2663dd8df2e84719c2e1ffcdf (diff) | |
| parent | efa834aaec596b0d5e7b314a53e6b258ce44728c (diff) | |
| download | puppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.tar.gz puppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.tar.xz puppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.zip | |
Merge commit '2.6.1rc4' into next
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 |