components/puppet/patches/puppet-07-PUP-2641.patch
author Drew Fisher <drew.fisher@oracle.com>
Fri, 30 May 2014 08:19:47 -0700
branchs11-update
changeset 3151 0dbc999aeec2
permissions -rw-r--r--
18713757 'puppet resource service' outputs incorrect services 18820288 puppet describe --list outputs 'no documentation' incorrectly 18849968 Typos in link_properties and interface_properties docs 18856443 link_aggregation type provider duplicates lower_links 18859231 Typo in address_object and link_aggregation resource type docs 18859804 Typo in nis resource type 18859837 Typo in ldap resource type 18859156 Duplicate doc content for address_object resource type 18865233 ip_interface resource fails when ipmp or aggregations present

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.4.1/lib/puppet/application/describe.rb.orig	2014-05-29 08:14:12.779421080 -0600
+++ puppet-3.4.1/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