components/ruby/puppet/patches/puppet-07-PUP-2641.patch
author osayama <osamu.sayama@oracle.com>
Fri, 16 Sep 2016 08:38:07 +0900
changeset 6914 0c9c2d460328
parent 5860 afd31ba91ee9
child 7565 48aa82a0931f
permissions -rw-r--r--
24576350 Latin font should not be used for ASCII when monospace with CJK fonts

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.8.6/lib/puppet/application/describe.rb.orig	2016-04-19 14:29:00.513107441 -0700
+++ puppet-3.8.6/lib/puppet/application/describe.rb	2016-04-19 14:29:42.599397493 -0700
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
+
 require 'puppet/application'
 
 class Formatter
@@ -70,13 +74,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