From 4a9c85763b7bf2db6da52daa9e8221eb59ffa9d2 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Sun, 5 Sep 2010 11:26:58 -0700 Subject: Fix for #4693 -- implicit stages should never be serialized My fix for #4542 was overly enthusiastic about assuring that all resources had a stage, resulting in stages designations being serialized for resources in manifests which did not use resources (everything was in implicit main). This broke 0.25.x compatibility, as all catalogs now refered to stages. This patch scales back the change for #4542 slightly, supressing the setting of main on the puppetmaster and relying on the default behaviour on the client (for 2.6.x and later, treat it as main; for 0.25.x, do nothing). --- lib/puppet/parser/compiler.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/puppet/parser/compiler.rb') 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 -- cgit