[oe-commits] [openembedded-core] 07/39: package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.'

[git at git.openembedded.org]

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

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

commit 33e1c9d2878e2b73f8ffdb817a6785fd1c73d4b5
Author: Mariano Lopez <mariano.lopez at linux.intel.com>
AuthorDate: Wed Apr 5 11:46:35 2017 -0700

    package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.'
    
    opkg uses empty lines as separator for next package and if an ipk file was
    packaged with empty lines in DESCRIPTION opkg won't be able to handle such ipk
    file, this happens at execution time.
    
    This commit will replace empty lines in DESCRIPTION with a '.' when generating
    an ipk package to avoid this issue.
    
    [YOCTO #10677]
    
    Signed-off-by: Mariano Lopez <mariano.lopez at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/package_ipk.bbclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index fa47385..c7cec9d 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -145,7 +145,11 @@ python do_package_ipk () {
                         # 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.strip(), width=100000, initial_indent=' ', subsequent_indent=' '))
+                        line = textwrap.fill(t.strip(),
+                                             width=100000,
+                                             initial_indent=' ',
+                                             subsequent_indent=' ') or '.'
+                        ctrlfile.write('%s\n' % line)
                 else:
                     # Auto indent
                     ctrlfile.write('%s\n' % textwrap.fill(description, width=74, initial_indent=' ', subsequent_indent=' '))

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