]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_deb.bbclass: Fix multi-line package descriptions
authorAndreas Oberritter <obi@opendreambox.org>
Fri, 28 Apr 2017 18:38:21 +0000 (20:38 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 29 Apr 2017 10:16:25 +0000 (11:16 +0100)
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>
meta/classes/package_deb.bbclass

index 1f1bc81e14f0f9ff644716203d5b234d02b5a162..3cd5efa788645557afa114d42623fc4abfa74f06 100644 (file)
@@ -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=' '))