summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Price <chris@puppetlabs.com>2012-08-13 11:26:42 -0700
committerChris Price <chris@puppetlabs.com>2012-08-13 11:26:42 -0700
commite2954b26c191055fb084162a31d63058677d3026 (patch)
tree4e55712d34decc632aa1b9e181ad4fb42b12659f
parent9c76b6af1200c71e7ae72e0e2f349919a3081738 (diff)
parentdde3a14ab0f5b08aad68ae1975aa1172384774c7 (diff)
downloadpuppet-inifile-e2954b26c191055fb084162a31d63058677d3026.tar.gz
puppet-inifile-e2954b26c191055fb084162a31d63058677d3026.tar.bz2
Merge pull request #1 from stephenrjohnson/master
Fix require paths
-rw-r--r--lib/puppet/provider/ini_setting/ruby.rb2
-rw-r--r--lib/puppet/util/ini_file.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/provider/ini_setting/ruby.rb b/lib/puppet/provider/ini_setting/ruby.rb
index e44a107..f04af06 100644
--- a/lib/puppet/provider/ini_setting/ruby.rb
+++ b/lib/puppet/provider/ini_setting/ruby.rb
@@ -1,4 +1,4 @@
-require 'puppet/util/ini_file'
+require File.expand_path('../../../util/ini_file', __FILE__)
Puppet::Type.type(:ini_setting).provide(:ruby) do
def exists?
diff --git a/lib/puppet/util/ini_file.rb b/lib/puppet/util/ini_file.rb
index 75d8a9f..51dfda7 100644
--- a/lib/puppet/util/ini_file.rb
+++ b/lib/puppet/util/ini_file.rb
@@ -1,5 +1,5 @@
-require 'puppet/util/external_iterator'
-require 'puppet/util/ini_file/section'
+require File.expand_path('../external_iterator', __FILE__)
+require File.expand_path('../ini_file/section', __FILE__)
module Puppet
module Util
@@ -129,4 +129,4 @@ module Util
end
end
-end \ No newline at end of file
+end