Fix pull request #127, possible lib loading issues

sensu · Jan 18, 2014 · 231196f · 231196f
1 parent 64b37e9
commit 231196f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/puppet/provider/sensu_filter/json.rb b/lib/puppet/provider/sensu_filter/json.rb
@@ -1,7 +1,12 @@
 require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
 require 'json' if Puppet.features.json?
 
-require 'puppet_x/sensu/to_type'
+begin
+  require 'puppet_x/sensu/to_type'
+rescue LoadError => e
+  libdir = Pathname.new(__FILE__).parent.parent.parent
+  require File.join(libdir, 'puppet_x/sensu/to_type')
+end
 
 Puppet::Type.type(:sensu_filter).provide(:json) do
   confine :feature => :json

diff --git a/lib/puppet/type/sensu_filter.rb b/lib/puppet/type/sensu_filter.rb
@@ -1,4 +1,9 @@
-require 'puppet_x/sensu/to_type'
+begin
+  require 'puppet_x/sensu/to_type'
+rescue LoadError => e
+  libdir = Pathname.new(__FILE__).parent.parent.parent
+  require File.join(libdir, 'puppet_x/sensu/to_type')
+end
 Puppet::Type.newtype(:sensu_filter) do
   @doc = ""