equal
deleted
inserted
replaced
1 In-house patch to fix upstream bug PUP-2641 |
1 In-house patch to fix upstream bug PUP-2641 |
2 https://tickets.puppetlabs.com/browse/PUP-2641 |
2 https://tickets.puppetlabs.com/browse/PUP-2641 |
3 Patch has been submitted upstream but not yet accepted. |
3 Patch has been submitted upstream but not yet accepted. |
4 |
4 |
5 --- puppet-3.6.2/lib/puppet/application/describe.rb.orig 2014-05-29 08:14:12.779421080 -0600 |
5 --- puppet-3.8.6/lib/puppet/application/describe.rb.orig 2016-04-19 14:29:00.513107441 -0700 |
6 +++ puppet-3.6.2/lib/puppet/application/describe.rb 2014-05-29 08:14:37.064254740 -0600 |
6 +++ puppet-3.8.6/lib/puppet/application/describe.rb 2016-04-19 14:29:42.599397493 -0700 |
7 @@ -70,13 +70,8 @@ |
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 @@ |
8 }.each do |name| |
16 }.each do |name| |
9 type = @types[name] |
17 type = @types[name] |
10 s = type.doc.gsub(/\s+/, " ") |
18 s = type.doc.gsub(/\s+/, " ") |
11 - n = s.index(". ") |
19 - n = s.index(". ") |
12 - if n.nil? |
20 - if n.nil? |