--- a/components/ruby/puppet/patches/puppet-07-PUP-2641.patch Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-07-PUP-2641.patch Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
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 @@
+--- 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+/, " ")