[OE-core] [PATCH 1/2] package_deb.bbclass: Fix multi-line package descriptions
Andreas Oberritter
obi at opendreambox.org
Fri Apr 28 18:38:21 UTC 2017
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>
---
Please note: As opkg uses the same format, I believe this to be broken in
do_package_ipk, too, which generates '.' for empty lines instead of ' .'.
Contrary to the removed comment, the use of textwrap.fill is pointless here.
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=' '))
--
2.7.4
More information about the Openembedded-core
mailing list