| author | Rich Burridge <rich.burridge@oracle.com> |
| Tue, 02 May 2017 17:33:26 -0700 | |
| changeset 7964 | d9801318ed3d |
| parent 7565 | 48aa82a0931f |
| permissions | -rw-r--r-- |
|
1921
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to fix upstream bug PUP-2641 |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
https://tickets.puppetlabs.com/browse/PUP-2641 |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
Patch has been submitted upstream but not yet accepted. |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
|
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
5 |
--- puppet-3.8.6/lib/puppet/application/describe.rb.orig 2016-04-19 14:29:00.513107441 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
6 |
+++ puppet-3.8.6/lib/puppet/application/describe.rb 2016-04-19 14:29:42.599397493 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
7 |
@@ -70,13 +74,8 @@ |
|
1921
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
}.each do |name| |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
type = @types[name] |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
s = type.doc.gsub(/\s+/, " ") |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
- n = s.index(". ")
|
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
- if n.nil? |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
- s = ".. no documentation .." |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
- elsif n > 45 |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
+ if s.length > 45 |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
s = s[0, 45] + " ..." |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
- else |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
- s = s[0, n] |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
end |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
printf "%-15s - %s\n", name, s |
|
489d0d0f656f
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
end |