components/puppet/patches/puppet-07-PUP-2641.patch
branchs11u2-sru
changeset 3460 5c5af6e58474
parent 3457 6358358b4186
child 3461 1240b4c4e38d
equal deleted inserted replaced
3457:6358358b4186 3460:5c5af6e58474
     1 In-house patch to fix upstream bug PUP-2641
       
     2 https://tickets.puppetlabs.com/browse/PUP-2641
       
     3 Patch has been submitted upstream but not yet accepted.
       
     4 
       
     5 --- puppet-3.4.1/lib/puppet/application/describe.rb.orig	2014-05-29 08:14:12.779421080 -0600
       
     6 +++ puppet-3.4.1/lib/puppet/application/describe.rb	2014-05-29 08:14:37.064254740 -0600
       
     7 @@ -70,13 +70,8 @@
       
     8      }.each do |name|
       
     9        type = @types[name]
       
    10        s = type.doc.gsub(/\s+/, " ")
       
    11 -      n = s.index(". ")
       
    12 -      if n.nil?
       
    13 -        s = ".. no documentation .."
       
    14 -      elsif n > 45
       
    15 +      if s.length > 45
       
    16          s = s[0, 45] + " ..."
       
    17 -      else
       
    18 -        s = s[0, n]
       
    19        end
       
    20        printf "%-15s - %s\n", name, s
       
    21      end