[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

Matt Robinson matt at puppetlabs.com
Tue May 10 08:09:09 UTC 2011


The following commit has been merged in the experimental branch:
commit a520c5e3f6cbb06b5902b3021db6b024b085408a
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Sat Mar 26 10:01:26 2011 -0700

    (#6830) Handle case where array is actually a string
    
    Another case where in Ruby 1.8 you can call enumerable methods on
    strings that you can't in Ruby 1.9.
    
        undefined method `collect' for "dev2 dev1":String
    
    Reviewed-by: Jesse Wolfe <jesse at puppetlabs.com>

diff --git a/lib/puppet/type/zpool.rb b/lib/puppet/type/zpool.rb
index 40ee8f2..2da713c 100755
--- a/lib/puppet/type/zpool.rb
+++ b/lib/puppet/type/zpool.rb
@@ -4,6 +4,7 @@ module Puppet
     class VDev < Property
 
       def flatten_and_sort(array)
+        array = [array] unless array.is_a? Array
         array.collect { |a| a.split(' ') }.flatten.sort
       end
 

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list