summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-04-13 19:20:40 -0700
committerNick Lewis <nick@puppetlabs.com>2011-04-13 19:20:40 -0700
commitc7ae6bde57fd3ab8380cd5804fd87283bb708755 (patch)
treec0712b1ac2b936fd5a3a2ea0da6c9a976c1cb7d2 /lib
parent3ab44c7ce01ab86a995deb66228f5be95239c92a (diff)
parent9bc4bcefb1a9f2545b4828dcea7a41ef450e7d52 (diff)
downloadpuppet-c7ae6bde57fd3ab8380cd5804fd87283bb708755.tar.gz
puppet-c7ae6bde57fd3ab8380cd5804fd87283bb708755.tar.xz
puppet-c7ae6bde57fd3ab8380cd5804fd87283bb708755.zip
Merge branch 'ticket/next/7103' into next
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/network/http/handler.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb
index 2b9e81b61..2c78a0283 100644
--- a/lib/puppet/network/http/handler.rb
+++ b/lib/puppet/network/http/handler.rb
@@ -122,10 +122,10 @@ module Puppet::Network::HTTP::Handler
end
# Execute our head.
- def do_head(indirection_request, request, response)
- unless indirection_request.model.head(indirection_request.key, indirection_request.to_hash)
- Puppet.info("Could not find #{indirection_request.indirection_name} for '#{indirection_request.key}'")
- return do_exception(response, "Could not find #{indirection_request.indirection_name} #{indirection_request.key}", 404)
+ def do_head(indirection_name, key, params, request, response)
+ unless self.model(indirection_name).indirection.head(key, params)
+ Puppet.info("Could not find #{indirection_name} for '#{key}'")
+ return do_exception(response, "Could not find #{indirection_name} #{key}", 404)
end
# No need to set a response because no response is expected from a