[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5533/8267] package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.'



commit 78971cee155f35181dd3f312880914b464daa515
Author: Mariano Lopez <mariano lopez linux intel com>
Date:   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]
    
    (From OE-Core rev: 3e678d9b6a9eaeed76ce538d7f6ecf9f423864bc)
    
    Signed-off-by: Mariano Lopez <mariano lopez linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/package_ipk.bbclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
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=' '))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]