diff options
| author | Markus Roberts <Markus@reality.com> | 2010-11-04 13:53:23 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-11-12 15:02:00 +1100 |
| commit | b15231df5842df2ea83b779b22e6756e51bc39d0 (patch) | |
| tree | 34978db4a199ccca92e35c66e154851bc60fff27 /lib/puppet/defaults.rb | |
| parent | ea435a43dc97487d054271a9efb208f361408339 (diff) | |
| download | puppet-b15231df5842df2ea83b779b22e6756e51bc39d0.tar.gz puppet-b15231df5842df2ea83b779b22e6756e51bc39d0.tar.xz puppet-b15231df5842df2ea83b779b22e6756e51bc39d0.zip | |
Fix for #4299 -- Don't require which
We already had an internal implementation of which hiding under an assumed
name (Puppet::Util.binary); this commit calls it out of hiding and uses it
consisantly.
Diffstat (limited to 'lib/puppet/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index b8437fe29..93b01c779 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -637,7 +637,7 @@ module Puppet setdefaults( :tagmail, :tagmap => ["$confdir/tagmail.conf", "The mapping between reporting tags and email addresses."], - :sendmail => [%x{which sendmail 2>/dev/null}.chomp, "Where to find the sendmail binary with which to send email."], + :sendmail => [which('sendmail') || '', "Where to find the sendmail binary with which to send email."], :reportfrom => ["report@" + [Facter["hostname"].value, Facter["domain"].value].join("."), "The 'from' email address for the reports."], :smtpserver => ["none", "The server through which to send email reports."] |