summaryrefslogtreecommitdiffstats
path: root/lib/puppet/node
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-10-05 00:08:15 -0500
committerLuke Kanies <luke@madstop.com>2007-10-05 00:08:15 -0500
commit275af562b462813ddf5ddbad2192ddc2bf57770c (patch)
treeaceabf68095b8c34fd599f245022a9aaab0984da /lib/puppet/node
parentce0178316d8cefd072f53d39b59ce47332f6ec8f (diff)
parent29accba1b9343f4967c15d36506b3bf60d5f0f9c (diff)
downloadpuppet-275af562b462813ddf5ddbad2192ddc2bf57770c.tar.gz
puppet-275af562b462813ddf5ddbad2192ddc2bf57770c.tar.xz
puppet-275af562b462813ddf5ddbad2192ddc2bf57770c.zip
Merge branch 'routing' of http://git.rickbradley.com/puppet into routing
Diffstat (limited to 'lib/puppet/node')
-rw-r--r--lib/puppet/node/configuration.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/node/configuration.rb b/lib/puppet/node/configuration.rb
index 53f63d003..3571eecda 100644
--- a/lib/puppet/node/configuration.rb
+++ b/lib/puppet/node/configuration.rb
@@ -226,9 +226,10 @@ class Puppet::Node::Configuration < Puppet::PGraph
raise Puppet::DevError, "Could not find 'main' class; cannot generate configuration"
end
- # Retrive the bucket for the top-level scope and set the appropriate metadata.
+ # Retrieve the bucket for the top-level scope and set the appropriate metadata.
unless result = buckets[main.to_s]
- raise Puppet::DevError, "Did not evaluate top scope"
+ # This only happens when the configuration is entirely empty.
+ result = buckets[main.to_s] = main.to_trans
end
result.classes = classes