Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-17 11:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

* wrap-and-sort:

Browse Source 
- Correct typo in options --wrap-allways -> --wrap-always
This commit is contained in:
Stefano Rivera 2010-11-24 18:38:18 +02:00
parent 76cc07a219
commit 22bae2ac33
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -2,8 +2,10 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low
* edit-patch: Detect quilt patch-system in 3.0 (quilt) packages without any * edit-patch: Detect quilt patch-system in 3.0 (quilt) packages without any
patches yet. patches yet.
* wrap-and-sort:
- Correct typo in options --wrap-allways -> --wrap-always
-- Stefano Rivera <stefanor@ubuntu.com> Wed, 24 Nov 2010 17:58:18 +0200 -- Stefano Rivera <stefano@rivera.za.net> Wed, 24 Nov 2010 18:37:49 +0200
ubuntu-dev-tools (0.106) experimental; urgency=low ubuntu-dev-tools (0.106) experimental; urgency=low

20
wrap-and-sort
View File

@ -53,21 +53,21 @@ class Control(object):
f.write(content.encode("utf-8")) f.write(content.encode("utf-8"))
f.close() f.close()
def wrap_and_sort(self, wrap_allways=True): def wrap_and_sort(self, wrap_always=True):
for paragraph in self.paragraphs: for paragraph in self.paragraphs:
for field in CONTROL_LIST_FIELDS: for field in CONTROL_LIST_FIELDS:
if field in paragraph: if field in paragraph:
self._wrap_field(paragraph, field, wrap_allways) self._wrap_field(paragraph, field, wrap_always)
if "Uploaders" in paragraph: if "Uploaders" in paragraph:
self._wrap_field(paragraph, "Uploaders", wrap_allways, False) self._wrap_field(paragraph, "Uploaders", wrap_always, False)
def _wrap_field(self, control, entry, wrap_allways, sort=True): def _wrap_field(self, control, entry, wrap_always, sort=True):
packages = map(lambda x: x.strip(), control[entry].split(",")) packages = map(lambda x: x.strip(), control[entry].split(","))
if sort: if sort:
packages = sort_list(packages) packages = sort_list(packages)
lenght = len(entry) + 2 * len(packages) + sum(map(len, packages)) lenght = len(entry) + 2 * len(packages) + sum(map(len, packages))
if wrap_allways or lenght > 80: if wrap_always or lenght > 80:
indentation = " " * (len(entry) + 2) indentation = " " * (len(entry) + 2)
packages_with_indention = map(lambda x: indentation + x, packages) packages_with_indention = map(lambda x: indentation + x, packages)
control[entry] = ",\n".join(packages_with_indention).strip() control[entry] = ",\n".join(packages_with_indention).strip()
@ -110,7 +110,7 @@ def sort_list(l):
param = filter(lambda x: x.startswith("${"), l) param = filter(lambda x: x.startswith("${"), l)
return sorted(normal) + sorted(param) return sorted(normal) + sorted(param)
def main(script_name, cleanup, wrap_allways, verbose=False): def main(script_name, cleanup, wrap_always, verbose=False):
if not os.path.isdir("debian"): if not os.path.isdir("debian"):
print >> sys.stderr, "%s: Error: No debian directory found." % \ print >> sys.stderr, "%s: Error: No debian directory found." % \
(script_name) (script_name)
@ -122,7 +122,7 @@ def main(script_name, cleanup, wrap_allways, verbose=False):
if verbose: if verbose:
print control_file print control_file
control = Control(control_file, cleanup) control = Control(control_file, cleanup)
control.wrap_and_sort(wrap_allways) control.wrap_and_sort(wrap_always)
control.save() control.save()
copyright_files = filter(os.path.isfile, copyright_files = filter(os.path.isfile,
@ -145,9 +145,9 @@ if __name__ == "__main__":
epilog = "See %s(1) for more info." % (script_name) epilog = "See %s(1) for more info." % (script_name)
parser = optparse.OptionParser(usage=usage, epilog=epilog) parser = optparse.OptionParser(usage=usage, epilog=epilog)
parser.add_option("-a", "--wrap-allways", parser.add_option("-a", "--wrap-always",
help="wrap lists even if they fit into one 80 character long line", help="wrap lists even if they fit into one 80 character long line",
dest="wrap_allways", action="store_true", default=False) dest="wrap_always", action="store_true", default=False)
parser.add_option("-n", "--no-cleanup", help="don't cleanup whitespaces", parser.add_option("-n", "--no-cleanup", help="don't cleanup whitespaces",
dest="cleanup", action="store_false", default=True) dest="cleanup", action="store_false", default=True)
parser.add_option("-v", "--verbose", help="print more information", parser.add_option("-v", "--verbose", help="print more information",
@ -160,4 +160,4 @@ if __name__ == "__main__":
"Unsupported additional parameters specified", ", ".join(args)) "Unsupported additional parameters specified", ", ".join(args))
sys.exit(1) sys.exit(1)
main(script_name, options.cleanup, options.wrap_allways, options.verbose) main(script_name, options.cleanup, options.wrap_always, options.verbose)