| author | Petr Nyc <Petr.Nyc@Oracle.COM> |
| Wed, 15 Oct 2014 01:05:43 -0700 | |
| branch | s11u2-sru |
| changeset 3393 | 553885b82394 |
| parent 3151 | 0dbc999aeec2 |
| permissions | -rw-r--r-- |
|
3151
0dbc999aeec2
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 |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
https://tickets.puppetlabs.com/browse/PUP-2641 |
|
0dbc999aeec2
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. |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
|
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
--- puppet-3.4.1/lib/puppet/application/describe.rb.orig 2014-05-29 08:14:12.779421080 -0600 |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
6 |
+++ puppet-3.4.1/lib/puppet/application/describe.rb 2014-05-29 08:14:37.064254740 -0600 |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
7 |
@@ -70,13 +70,8 @@ |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
}.each do |name| |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
type = @types[name] |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
s = type.doc.gsub(/\s+/, " ") |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
- n = s.index(". ")
|
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
- if n.nil? |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
- s = ".. no documentation .." |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
- elsif n > 45 |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
+ if s.length > 45 |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
s = s[0, 45] + " ..." |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
- else |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
- s = s[0, n] |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
end |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
printf "%-15s - %s\n", name, s |
|
0dbc999aeec2
18713757 'puppet resource service' outputs incorrect services
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
end |