components/ruby/puppet/patches/puppet-07-PUP-2641.patch
author Kristina Tripp <Kristina.Tripp@oracle.com>
Fri, 07 Nov 2014 17:33:48 -0800
branchs11-update
changeset 3458 4912663e9858
parent 3151 components/puppet/patches/puppet-07-PUP-2641.patch@0dbc999aeec2
child 5860 afd31ba91ee9
permissions -rw-r--r--
18960221 problem in UTILITY/PUPPET 18960237 Update Puppet to 3.6.2 19612179 Prepare puppet code to support multiple or different releases of ruby 19652539 gmake install of puppet fails due to Makefile omission 19646558 puppet-19 package not installed if ruby-19 not installed 19685659 salvage warning upgrading puppet 19988165 Puppet <name>~ files from patch process are included in puppet-19 package

In-house patch to fix upstream bug PUP-2641
https://tickets.puppetlabs.com/browse/PUP-2641
Patch has been submitted upstream but not yet accepted.

--- puppet-3.6.2/lib/puppet/application/describe.rb.orig	2014-05-29 08:14:12.779421080 -0600
+++ puppet-3.6.2/lib/puppet/application/describe.rb	2014-05-29 08:14:37.064254740 -0600
@@ -70,13 +70,8 @@
     }.each do |name|
       type = @types[name]
       s = type.doc.gsub(/\s+/, " ")
-      n = s.index(". ")
-      if n.nil?
-        s = ".. no documentation .."
-      elsif n > 45
+      if s.length > 45
         s = s[0, 45] + " ..."
-      else
-        s = s[0, n]
       end
       printf "%-15s - %s\n", name, s
     end