summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-07-09 17:41:21 -0700
committerJames Turnbull <james@lovedthanlost.net>2008-07-10 19:57:25 +1000
commit80436550a1e3040399e410be3edf7c44d29fc320 (patch)
treee4a5dab3a6fe51fa634c43d41142d4dc231b7373 /lib
parent605d760dd72b7b6bd3fd54e9f6c3ffacb1b9ee52 (diff)
downloadpuppet-80436550a1e3040399e410be3edf7c44d29fc320.tar.gz
puppet-80436550a1e3040399e410be3edf7c44d29fc320.tar.xz
puppet-80436550a1e3040399e410be3edf7c44d29fc320.zip
Fixing #1408 - --loadclasses works again.
The problem was that the mechanism I was using for passing the node to the compiler was conflicting with the Indirector::Request's method of handling node authentication. Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/indirector/catalog/compiler.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/indirector/catalog/compiler.rb b/lib/puppet/indirector/catalog/compiler.rb
index 455a92cc7..a6a812817 100644
--- a/lib/puppet/indirector/catalog/compiler.rb
+++ b/lib/puppet/indirector/catalog/compiler.rb
@@ -14,7 +14,7 @@ class Puppet::Node::Catalog::Compiler < Puppet::Indirector::Code
# Compile a node's catalog.
def find(request)
- unless node = request.options[:node] || find_node(request.key)
+ unless node = request.options[:use_node] || find_node(request.key)
raise ArgumentError, "Could not find node '%s'; cannot compile" % request.key
end