[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

test branch puppet-dev at googlegroups.com
Wed Jul 14 10:34:42 UTC 2010


The following commit has been merged in the upstream branch:
commit 45ca669671cc2cf4f2f811bbd48b5283d8fa6c8a
Author: Markus Roberts <Markus at reality.com>
Date:   Wed Jun 23 10:06:16 2010 -0700

    Targeted fix for #3851
    
    Older / user written providers may just return a bare string from their ___cmd
    functions instead of an array.  This forces the command as used to be an array
    without breaking the cases where they (correctly) do return an array.

diff --git a/lib/puppet/provider/service/base.rb b/lib/puppet/provider/service/base.rb
index 0bf2b20..183bf33 100755
--- a/lib/puppet/provider/service/base.rb
+++ b/lib/puppet/provider/service/base.rb
@@ -141,7 +141,7 @@ Puppet::Type.type(:service).provide :base do
         if c = @resource[type]
             cmd = [c]
         else
-            cmd = self.send("%scmd" % type)
+            cmd = [send("#{type}cmd")].flatten
         end
         return texecute(type, cmd, fof)
     end

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list