summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorDavid Schmitt <david@dasz.at>2010-05-21 15:38:06 +0200
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commitf15a32461dedda250da5c01226d6b35cc36874ce (patch)
treed5ec29ee1ea3767e2a3a4e088f9b9c89e971c682 /lib/puppet
parent86bd83877017f91922c17e311058d1cc8fbd55f8 (diff)
downloadpuppet-f15a32461dedda250da5c01226d6b35cc36874ce.tar.gz
puppet-f15a32461dedda250da5c01226d6b35cc36874ce.tar.xz
puppet-f15a32461dedda250da5c01226d6b35cc36874ce.zip
Fix Exec type
Diffstat (limited to 'lib/puppet')
-rwxr-xr-xlib/puppet/type/exec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
index 41150ba94..8a773e93e 100755
--- a/lib/puppet/type/exec.rb
+++ b/lib/puppet/type/exec.rb
@@ -513,12 +513,12 @@ module Puppet
if self[:path]
if Puppet.features.posix? and !File.exists?(exe)
withenv :PATH => self[:path].join(File::PATH_SEPARATOR) do
- path = %{which #{exe}}.chomp
+ path = %x{which #{exe}}.chomp
if path == ""
raise ArgumentError,
"Could not find command '%s'" % exe
else
- exe = File.join(path, exe)
+ exe = path
end
end
elsif Puppet.features.win32? and !File.exists?(exe)