summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-08-23 21:59:14 -0500
committerLuke Kanies <luke@madstop.com>2008-08-26 22:40:40 -0700
commit6335b143a312481aaa200f71cd25dffd4f88c8ae (patch)
tree7faa499dcbf7f1a61deb4c171aa4b36e15c63ff3 /lib/puppet
parent1104edb13926a53ee90685d96700cb03eaeca509 (diff)
downloadpuppet-6335b143a312481aaa200f71cd25dffd4f88c8ae.tar.gz
puppet-6335b143a312481aaa200f71cd25dffd4f88c8ae.tar.xz
puppet-6335b143a312481aaa200f71cd25dffd4f88c8ae.zip
Causing the Indirection to fail if a terminus selection hook does not return a value.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/indirector/indirection.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb
index e6068a6aa..04c3aed23 100644
--- a/lib/puppet/indirector/indirection.rb
+++ b/lib/puppet/indirector/indirection.rb
@@ -274,7 +274,9 @@ class Puppet::Indirector::Indirection
def prepare(request)
# Pick our terminus.
if respond_to?(:select_terminus)
- terminus_name = select_terminus(request)
+ unless terminus_name = select_terminus(request)
+ raise ArgumentError, "Could not determine appropriate terminus for %s" % request
+ end
else
terminus_name = terminus_class
end