summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2011-01-30 03:32:49 +1100
committerJames Turnbull <james@lovedthanlost.net>2011-01-30 03:32:49 +1100
commit1bfc9a0314c3b6247a3a1e4689c80997d343b2dc (patch)
treee69b8b5d9f0dd354a62d426865192f579a66e411 /lib/puppet
parent517c6794606e9adde7f2912d3b949cfcc18a446a (diff)
downloadpuppet-1bfc9a0314c3b6247a3a1e4689c80997d343b2dc.tar.gz
puppet-1bfc9a0314c3b6247a3a1e4689c80997d343b2dc.tar.xz
puppet-1bfc9a0314c3b6247a3a1e4689c80997d343b2dc.zip
Fixed #6071 - Fixed typo and improved exec path error message
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 606888c75..723a8ca5f 100755
--- a/lib/puppet/type/exec.rb
+++ b/lib/puppet/type/exec.rb
@@ -335,7 +335,7 @@ module Puppet
# Pull down the main aliases file
file { \"/etc/aliases\":
source => \"puppet://server/module/aliases\"
- }
+ }
# Rebuild the database, but only when the file changes
exec { newaliases:
@@ -664,7 +664,7 @@ module Puppet
def validatecmd(cmd)
exe = extractexe(cmd)
# if we're not fully qualified, require a path
- self.fail "'#{cmd}' is both unqualifed and specified no search path" if File.expand_path(exe) != exe and self[:path].nil?
+ self.fail "'#{cmd}' is not qualified and no path was specified. Please qualify the command or specify a path." if File.expand_path(exe) != exe and self[:path].nil?
end
def extractexe(cmd)