[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

test branch puppet-dev at googlegroups.com
Wed Jul 14 10:34:26 UTC 2010


The following commit has been merged in the upstream branch:
commit f15a32461dedda250da5c01226d6b35cc36874ce
Author: David Schmitt <david at dasz.at>
Date:   Fri May 21 15:38:06 2010 +0200

    Fix Exec type

diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
index 41150ba..8a773e9 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)

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list