[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5
Daniel Pittman
daniel at puppetlabs.com
Tue May 10 08:10:29 UTC 2011
The following commit has been merged in the experimental branch:
commit a3f5f974251e14f02e8f83e12f4589581dd21828
Author: Daniel Pittman <daniel at puppetlabs.com>
Date: Tue Mar 29 11:56:43 2011 -0700
MAINT: fix error reporting when you set terminus incorrectly.
Previously we tried to invoke a class method on an instance, and threw another
exception, which wasn't the most helpful behaviour. This fixes that to
correctly report the array of available terminus classes to the user.
Reviewed-By: Pieter van de Bruggen <pieter at puppetlabs.com>
diff --git a/lib/puppet/string/indirector.rb b/lib/puppet/string/indirector.rb
index 15984e3..48ec326 100644
--- a/lib/puppet/string/indirector.rb
+++ b/lib/puppet/string/indirector.rb
@@ -62,7 +62,7 @@ class Puppet::String::Indirector < Puppet::String
begin
indirection.terminus_class = from
rescue => detail
- raise "Could not set '#{indirection.name}' terminus to '#{from}' (#{detail}); valid terminus types are #{terminus_classes(indirection.name).join(", ") }"
+ raise "Could not set '#{indirection.name}' terminus to '#{from}' (#{detail}); valid terminus types are #{self.class.terminus_classes(indirection.name).join(", ") }"
end
end
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list