[oe-commits] [openembedded-core] 03/06: package_deb.bbclass: Fix multi-line package descriptions

git at git.openembedded.org git at git.openembedded.org
Sat Apr 29 10:18:31 UTC 2017


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit f66278f471c0bf9421ce2c55a56a144a0f9332bf
Author: Andreas Oberritter <obi at opendreambox.org>
AuthorDate: Fri Apr 28 20:38:21 2017 +0200

    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 at opendreambox.org>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/package_deb.bbclass | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 1f1bc81..3cd5efa 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=' '))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list