unkinben/puppet-bind
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #97 from inkblot/fix-require-loaderror

Browse Source 
Use a relative path load on LoadError
This commit is contained in:
Nate Riffe 2016-07-04 18:15:25 -05:00 committed by GitHub
commit 9091fd6cab
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/puppet/provider/dns_rr/nsupdate.rb
View File

@ -1,4 +1,10 @@
require 'puppet_bind/provider/nsupdate' begin
require 'puppet_bind/provider/nsupdate'
rescue LoadError => e
# work around for puppet bug SERVER-973
Puppet.info('Puppet did not autoload from the lib directory... falling back to relative path load.')
require File.join(File.expand_path(File.join(__FILE__, '../../../..')), 'puppet_bind/provider/nsupdate')
end
Puppet::Type.type(:dns_rr).provide(:nsupdate) do Puppet::Type.type(:dns_rr).provide(:nsupdate) do

8
lib/puppet/provider/resource_record/nsupdate.rb
View File

@ -1,4 +1,10 @@
require 'puppet_bind/provider/nsupdate' begin
require 'puppet_bind/provider/nsupdate'
rescue LoadError => e
# work around for puppet bug SERVER-973
Puppet.info('Puppet did not autoload from the lib directory... falling back to relative path load.')
require File.join(File.expand_path(File.join(__FILE__, '../../../..')), 'puppet_bind/provider/nsupdate')
end
Puppet::Type.type(:resource_record).provide(:nsupdate) do Puppet::Type.type(:resource_record).provide(:nsupdate) do