components/ruby/puppet/patches/puppet-07-PUP-2641.patch

   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.8.6/lib/puppet/application/describe.rb.orig        2016-04-19 14:29:00.513107441 -0700
   6 +++ puppet-3.8.6/lib/puppet/application/describe.rb     2016-04-19 14:29:42.599397493 -0700
   7 @@ -1,3 +1,7 @@
   8 +#######################################################################
   9 +# Oracle has modified the originally distributed contents of this file.
  10 +#######################################################################
  11 +
  12  require 'puppet/application'
  13
  14  class Formatter
  15 @@ -70,13 +74,8 @@
  16      }.each do |name|
  17        type = @types[name]
  18        s = type.doc.gsub(/\s+/, " ")
  19 -      n = s.index(". ")
  20 -      if n.nil?
  21 -        s = ".. no documentation .."
  22 -      elsif n > 45
  23 +      if s.length > 45
  24          s = s[0, 45] + " ..."
  25 -      else
  26 -        s = s[0, n]
  27        end
  28        printf "%-15s - %s\n", name, s
  29      end