From f1727f18ab933df9ecbecc2da8fad72eb441e0d5 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 22 Aug 2007 16:14:39 -0500 Subject: Adding the topscope metadata to the configuration being returned to the client, just like it expects, and fixing how the resource handler calls the master type. --- lib/puppet/parser/configuration.rb | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'lib/puppet/parser') diff --git a/lib/puppet/parser/configuration.rb b/lib/puppet/parser/configuration.rb index 26553d443..ea784da05 100644 --- a/lib/puppet/parser/configuration.rb +++ b/lib/puppet/parser/configuration.rb @@ -344,8 +344,23 @@ class Puppet::Parser::Configuration end end - # Clear the cache to encourage the GC + # Retrive the bucket for the top-level scope and set the appropriate metadata. result = buckets[topscope] + case topscope.type + when "": result.type = "main" + when nil: devfail "A Scope with no type" + else + result.type = topscope.type + end + if topscope.name + result.name = topscope.name + end + + unless classlist.empty? + result.classes = classlist + end + + # Clear the cache to encourage the GC buckets.clear return result end -- cgit