Jira (PUP-5915) exec resources fail unless cwd is readable

[James Ralston (JIRA)]

Title: Message Title

James Ralston commented on PUP-5915   Re: exec resources fail unless cwd is readable Also, unless I'm missing something, the fix is pretty simple. Here's a quick diff (ignoring whitespace changes, so that it's easier to read): --- /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/provider/exec.rb.ORIG 2016-02-02 14:10:21.000000000 -0500 +++ /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/provider/exec.rb 2016-02-17 14:05:12.750781461 -0500 @@ -12,7 +12,9 @@ checkexe(command) if dir = resource[:cwd] - unless File.directory?(dir) + if File.directory?(dir) + Dir.chdir(dir) + else if check dir = nil else @@ -21,12 +23,8 @@ end end - dir ||= Dir.pwd - debug "Executing#{check ? " check": ""} '#{command}'" begin - # Do our chdir - Dir.chdir(dir) do environment = {} environment[:PATH] = resource[:path].join(File::PATH_SEPARATOR) if resource[:path] @@ -66,7 +64,6 @@ raise ArgumentError, output end - end rescue Errno::ENOENT => detail self.fail Puppet::Error, detail.to_s, detail end I've tested this locally, and it seems to work. This does move the chdir() call outside of the begin/rescue/end block, though. Does the chdir() call by itself warrant its own begin/rescue/end block? Anyway, if this looks good, I'll be happy to submit a merge request. Add Comment   This message was sent by Atlassian JIRA (v6.4.12#64027-sha1:e3691cc) -- You received this message because you are subscribed to the Google Groups "Puppet Bugs" group. To unsubscribe from this group and stop receiving emails from it, send an email to puppet-bugs+unsubscr...@googlegroups.com. To post to this group, send email to puppet-bugs@googlegroups.com. Visit this group at https://groups.google.com/group/puppet-bugs. For more options, visit https://groups.google.com/d/optout.