From: Andreas Oberritter Date: Fri, 28 Apr 2017 18:38:21 +0000 (+0200) Subject: package_deb.bbclass: Fix multi-line package descriptions X-Git-Tag: yocto-4.0~17089 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f66278f471c0bf9421ce2c55a56a144a0f9332bf;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 1f1bc81e14f..3cd5efa7886 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=' '))