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

[Jacob Helwig]

The following commit has been merged in the upstream branch:
commit 9a7a39b3f9302b912e15fd77b4e18662e83089e4
Merge: 9d452353f887fcd3c916db970eda4a67971eb4f3 1bfc9a0314c3b6247a3a1e4689c80997d343b2dc
Author: Jacob Helwig <jacob at puppetlabs.com>
Date:   Tue Feb 1 16:48:33 2011 -0800

    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

diff --combined lib/puppet/type/exec.rb
index 8019af6,723a8ca..daa49e2
--- a/lib/puppet/type/exec.rb
+++ b/lib/puppet/type/exec.rb
@@@ -9,11 -9,41 +9,11 @@@ module Puppe
        commands is to use the checks like `creates` to avoid running the
        command unless some condition is met.
  
 -      Note also that you can restrict an `exec` to only run when it receives
 +      Note that you can restrict an `exec` to only run when it receives
        events by using the `refreshonly` parameter; this is a useful way to
        have your configuration respond to events with arbitrary commands.
  
 -      It is worth noting that `exec` is special, in that it is not
 -      currently considered an error to have multiple `exec` instances
 -      with the same name.  This was done purely because it had to be this
 -      way in order to get certain functionality, but it complicates things.
 -      In particular, you will not be able to use `exec` instances that
 -      share their commands with other instances as a dependency, since
 -      Puppet has no way of knowing which instance you mean.
 -
 -      For example:
 -
 -          # defined in the production class
 -          exec { \"make\":
 -            cwd => \"/prod/build/dir\",
 -            path => \"/usr/bin:/usr/sbin:/bin\"
 -          }
 -
 -          . etc. .
 -
 -          # defined in the test class
 -          exec { \"make\":
 -            cwd => \"/test/build/dir\",
 -            path => \"/usr/bin:/usr/sbin:/bin\"
 -          }
 -
 -      Any other type would throw an error, complaining that you had
 -      the same instance being managed in multiple places, but these are
 -      obviously different images, so `exec` had to be treated specially.
 -
 -      It is recommended to avoid duplicate names whenever possible.
 -
 -      Note that if an `exec` receives an event from another resource,
 +      Note also that if an `exec` receives an event from another resource,
        it will get executed again (or execute the command specified in `refresh`, if there is one).
  
        There is a strong tendency to use `exec` to do whatever work Puppet
@@@ -305,7 -335,7 +305,7 @@@
              # 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 -664,7 +634,7 @@@
      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