From c768c536e4dbee69690d0dc131df05a74b4eac8c Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Mon, 29 May 2017 10:36:47 -0700 Subject: package_ipk: correct ipk multiline descriptions Empty descriptions lines are set with a space following by a dot and the multiline ones require a leading space. Also, for non-empty lines, there is no need for formating with textwrap, so remove the logic for the latter. The documentation for multiline description was taken from [1]. [1] https://web.archive.org/web/20100727133051/http://handhelds.org:80/moin/moin.cgi/BuildingIpkgs [YOCTO #10677] Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 5cc7e0a7b2..d2ce3b3e17 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -148,16 +148,9 @@ def ipk_write_pkg(pkg, d): description = localdata.getVar('DESCRIPTION') or "." description = textwrap.dedent(description).strip() if '\\n' in description: - # Manually indent + # Manually indent: multiline description includes a leading space 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 - line = textwrap.fill(t.strip(), - width=100000, - initial_indent=' ', - subsequent_indent=' ') or '.' - ctrlfile.write('%s\n' % line) + ctrlfile.write(' %s\n' % (t.strip() or ' .')) else: # Auto indent ctrlfile.write('%s\n' % textwrap.fill(description, width=74, initial_indent=' ', subsequent_indent=' ')) -- cgit 1.2.3-korg