diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/metatype/providers.rb | 7 | ||||
| -rw-r--r-- | lib/puppet/provider/nameservice/netinfo.rb | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/puppet/metatype/providers.rb b/lib/puppet/metatype/providers.rb index 72459d3af..e33657a4c 100644 --- a/lib/puppet/metatype/providers.rb +++ b/lib/puppet/metatype/providers.rb @@ -200,7 +200,12 @@ class Puppet::Type provider = provider.intern end @resource.provider = provider - provider + + if provider.is_a?(Puppet::Provider) + provider.class.name + else + provider + end end end.parenttype = self end diff --git a/lib/puppet/provider/nameservice/netinfo.rb b/lib/puppet/provider/nameservice/netinfo.rb index 0323807e8..f03e67445 100644 --- a/lib/puppet/provider/nameservice/netinfo.rb +++ b/lib/puppet/provider/nameservice/netinfo.rb @@ -192,7 +192,7 @@ class NetInfo < Puppet::Provider::NameService # Get a report for a single resource, not the whole table def single_report(*properties) - self.class.report(*properties).find do |hash| hash[:name] == @resource[:name] end + self.class.report(*properties).find do |hash| hash[:name] == self.name end end def setuserlist(group, list) |