summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2017-04-28 20:38:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-29 11:16:25 +0100
commitf66278f471c0bf9421ce2c55a56a144a0f9332bf (patch)
tree585c21db3e927d337b81a41aed63342ce1251d3e
parent86a2db0b2997fd05882ae0119ef45b1ea5411d39 (diff)
downloadopenembedded-core-contrib-f66278f471c0bf9421ce2c55a56a144a0f9332bf.tar.gz
openembedded-core-contrib-f66278f471c0bf9421ce2c55a56a144a0f9332bf.tar.bz2
openembedded-core-contrib-f66278f471c0bf9421ce2c55a56a144a0f9332bf.zip
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. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_deb.bbclass5
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 () {
if '\\n' in description:
# Manually indent
for t in description.split('\\n'):
- # We don't limit the width when manually indent, but we do
- # need the textwrap.fill() to set the initial_indent and
- # subsequent_indent, so set a large width
- ctrlfile.write('%s\n' % textwrap.fill(t, width=100000, initial_indent=' ', subsequent_indent=' '))
+ ctrlfile.write(' %s\n' % (t.strip() or '.'))
else:
# Auto indent
ctrlfile.write('%s\n' % textwrap.fill(description.strip(), width=74, initial_indent=' ', subsequent_indent=' '))