Nemcio/opkg-utils
1
0
Fork 0
mirror of https://git.yoctoproject.org/git/opkg-utils synced 2026-03-20 08:41:30 +01:00
Code Issues Packages Projects Releases Activity

opkg.py: Remove reformatting of description field

Browse Source 
The Debian Policy Manual describes the format of the description field.
This includes information about how lines might be wrapped by programs
displaying this information, how to mark lines to not be wrapped, how
to mark a line as blank, and how leading spaces on a multi-line
description might be deleted.

By reformatting the description field in opkg.py, we are breaking many
of these behaviors and taking control of formatting away from the
author of the control file. Instead, we should simply copy the
description field with no reformatting.

Signed-off-by: Jeffrey Pautler <jeffrey.pautler@ni.com>
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
This commit is contained in:
Jeffrey Pautler
2017-10-05 14:05:59 +00:00
committed by Alejandro del Castillo
parent 8c5201fe09
commit 6cd5925cf7
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opkg.py
View File

@@ -230,7 +230,7 @@ class Package(object):
name = lineparts.group(1).lower()
value = lineparts.group(2)
while 1:
line = control.readline()
line = control.readline().rstrip()
if not line: break
if line[0] != ' ': break
value = value + '\n' + line
@@ -480,11 +480,7 @@ class Package(object):
if self.installed_size: out = out + "InstalledSize: %d\n" % int(self.installed_size)
if self.filename: out = out + "Filename: %s\n" % (self.filename)
if self.source: out = out + "Source: %s\n" % (self.source)
if self.description:
printable_description = textwrap.dedent(self.description).strip()
summary = printable_description.split('\n', 1)[0]
printable_description = printable_description.split('\n', 1)[-1].strip()
out = out + "Description: %s\n%s\n" % (summary, textwrap.fill(printable_description, width=74, initial_indent=' ', subsequent_indent=' '))
if self.description: out = out + "Description: %s\n" % (self.description)
if self.oe: out = out + "OE: %s\n" % (self.oe)
if self.homepage: out = out + "HomePage: %s\n" % (self.homepage)
if self.license: out = out + "License: %s\n" % (self.license)