[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5rc1-120-g2247c80

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 1bfc9a0314c3b6247a3a1e4689c80997d343b2dc
Author: James Turnbull <james at lovedthanlost.net>
Date:   Sun Jan 30 03:32:49 2011 +1100

    Fixed #6071 - Fixed typo and improved exec path error message

diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
index 606888c..723a8ca 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)

-- 
Puppet packaging for Debian