diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2017-04-28 20:38:21 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-29 11:17:23 +0100 |
commit | a428745d1594219413032d89065b522ff84a6ad3 (patch) | |
tree | eb44b25af2d31430dafe7e1190717f68b0f959b0 /meta | |
parent | 33dd5fb96cd0754191185c01247ee9ee8587c30e (diff) | |
download | poky-a428745d1594219413032d89065b522ff84a6ad3.tar.gz |
package_deb.bbclass: Fix multi-line package descriptions
In deb control files, each line of a long description starts with
a single space. Empty lines are represented by a single space
followed by a single full stop character.
(From OE-Core rev: f66278f471c0bf9421ce2c55a56a144a0f9332bf)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package_deb.bbclass | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 1f1bc81e14..3cd5efa788 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -176,10 +176,7 @@ python do_package_deb () { | |||
176 | if '\\n' in description: | 176 | if '\\n' in description: |
177 | # Manually indent | 177 | # Manually indent |
178 | for t in description.split('\\n'): | 178 | for t in description.split('\\n'): |
179 | # We don't limit the width when manually indent, but we do | 179 | ctrlfile.write(' %s\n' % (t.strip() or '.')) |
180 | # need the textwrap.fill() to set the initial_indent and | ||
181 | # subsequent_indent, so set a large width | ||
182 | ctrlfile.write('%s\n' % textwrap.fill(t, width=100000, initial_indent=' ', subsequent_indent=' ')) | ||
183 | else: | 180 | else: |
184 | # Auto indent | 181 | # Auto indent |
185 | ctrlfile.write('%s\n' % textwrap.fill(description.strip(), width=74, initial_indent=' ', subsequent_indent=' ')) | 182 | ctrlfile.write('%s\n' % textwrap.fill(description.strip(), width=74, initial_indent=' ', subsequent_indent=' ')) |