summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorPieter van de Bruggen <pieter@puppetlabs.com>2011-03-29 13:29:01 -0700
committerPieter van de Bruggen <pieter@puppetlabs.com>2011-03-29 13:29:01 -0700
commitf7f1e5822f3921336872956fe07c4da4406ce8eb (patch)
tree4653bbedb95460bdd22720f0d07d34952ad434ba /lib/puppet
parent4609e203fd47f8159118bb74a8308f9c6aee179f (diff)
downloadpuppet-f7f1e5822f3921336872956fe07c4da4406ce8eb.tar.gz
puppet-f7f1e5822f3921336872956fe07c4da4406ce8eb.tar.xz
puppet-f7f1e5822f3921336872956fe07c4da4406ce8eb.zip
(#6770) Fix Puppet::String#load_actions.
Reviewed-By: Nick Lewis
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/string.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/string.rb b/lib/puppet/string.rb
index 9a223a40c..783b6afe0 100644
--- a/lib/puppet/string.rb
+++ b/lib/puppet/string.rb
@@ -87,7 +87,7 @@ class Puppet::String
end
loaded << aname
Puppet.debug "Loading action '#{aname}' for '#{name}' from '#{fdir}/#{file}'"
- require "#{path}/#{aname}"
+ require "#{Dir.pwd}/#{aname}"
end
end
end