diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-01 16:48:33 -0800 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-01 16:48:33 -0800 |
| commit | 9a7a39b3f9302b912e15fd77b4e18662e83089e4 (patch) | |
| tree | af49e5eaa2643acc8864f6102c46df072046ce10 | |
| parent | 9d452353f887fcd3c916db970eda4a67971eb4f3 (diff) | |
| parent | 1bfc9a0314c3b6247a3a1e4689c80997d343b2dc (diff) | |
| download | puppet-9a7a39b3f9302b912e15fd77b4e18662e83089e4.tar.gz puppet-9a7a39b3f9302b912e15fd77b4e18662e83089e4.tar.xz puppet-9a7a39b3f9302b912e15fd77b4e18662e83089e4.zip | |
Merge remote branch 'jamtur01/tickets/2.6.x/6071' into 2.6.next
* jamtur01/tickets/2.6.x/6071:
Fixed #6071 - Fixed typo and improved exec path error message
| -rwxr-xr-x | lib/puppet/type/exec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb index 8019af67e..daa49e223 100755 --- a/lib/puppet/type/exec.rb +++ b/lib/puppet/type/exec.rb @@ -305,7 +305,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: @@ -634,7 +634,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) |