diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/metatype/metaparams.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/network/client/master.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/network/handler/master.rb | 15 |
3 files changed, 8 insertions, 11 deletions
diff --git a/lib/puppet/metatype/metaparams.rb b/lib/puppet/metatype/metaparams.rb index 0e31bb41c..92f12e6cb 100644 --- a/lib/puppet/metatype/metaparams.rb +++ b/lib/puppet/metatype/metaparams.rb @@ -274,7 +274,7 @@ class Puppet::Type # nil. unless object self.fail "Could not retrieve dependency '%s[%s]' of %s" % - [tname.to_s.capitalize, self.ref, name] + [tname.to_s.capitalize, @resource.ref, name] end # Are we requiring them, or vice versa? See the method docs diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index b9f77f61d..c6d7cd75d 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -694,5 +694,3 @@ class Puppet::Network::Client::Master < Puppet::Network::Client sleep(time) end end - -# $Id$ diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb index 18f37ca4a..c8db277ba 100644 --- a/lib/puppet/network/handler/master.rb +++ b/lib/puppet/network/handler/master.rb @@ -43,7 +43,7 @@ class Puppet::Network::Handler @local = false end - args[:Local] = local? + args[:Local] = true if hash.include?(:CA) and hash[:CA] @ca = Puppet::SSLCertificates::CA.new() @@ -77,17 +77,16 @@ class Puppet::Network::Handler fact_handler.set(client, facts) # And get the configuration from the config handler - config = config_handler.configuration(client) + begin + config = config_handler.configuration(client) + rescue => detail + puts detail.backtrace + raise + end return translate(config.extract) end - def local=(val) - @local = val - config_handler.local = val - fact_handler.local = val - end - private # Manipulate the client name as appropriate. |