mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-12 23:51:08 +00:00
* wrap-and-sort:
- Correct typo in options --wrap-allways -> --wrap-always - Sort debian/install as well as debian/*.install - Add one-space-indentation option: --short-indent - Remove null-entry from trailing comma in sorted lists
This commit is contained in:
Stefano Rivera
commit
d28b99753e
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -2,8 +2,13 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low
|
||||
|
||||
* edit-patch: Detect quilt patch-system in 3.0 (quilt) packages without any
|
||||
patches yet.
|
||||
* wrap-and-sort:
|
||||
- Correct typo in options --wrap-allways -> --wrap-always
|
||||
- Sort debian/install as well as debian/*.install
|
||||
- Add one-space-indentation option: --short-indent
|
||||
- Remove null-entry from trailing comma in sorted lists
|
||||
|
||||
-- Stefano Rivera <stefanor@ubuntu.com> Wed, 24 Nov 2010 17:58:18 +0200
|
||||
-- Stefano Rivera <stefanor@ubuntu.com> Wed, 24 Nov 2010 20:02:21 +0200
|
||||
|
||||
ubuntu-dev-tools (0.106) experimental; urgency=low
|
||||
|
||||
|
||||
243
wrap-and-sort
243
wrap-and-sort
@ -21,143 +21,162 @@ import os
|
||||
import sys
|
||||
|
||||
CONTROL_LIST_FIELDS = (
|
||||
"Breaks",
|
||||
"Build-Depends",
|
||||
"Build-Depends-Indep",
|
||||
"Conflicts",
|
||||
"Depends",
|
||||
"Enhances",
|
||||
"Provides",
|
||||
"Recommends",
|
||||
"Replaces",
|
||||
"Suggests",
|
||||
"Xb-Npp-MimeType",
|
||||
"Breaks",
|
||||
"Build-Depends",
|
||||
"Build-Depends-Indep",
|
||||
"Conflicts",
|
||||
"Depends",
|
||||
"Enhances",
|
||||
"Provides",
|
||||
"Recommends",
|
||||
"Replaces",
|
||||
"Suggests",
|
||||
"Xb-Npp-MimeType",
|
||||
)
|
||||
|
||||
class Control(object):
|
||||
def __init__(self, filename, cleanup):
|
||||
assert os.path.isfile(filename), "%s does not exist." % (filename)
|
||||
self.filename = filename
|
||||
sequence = open(filename)
|
||||
if cleanup:
|
||||
sequence = map(lambda l: l.rstrip(), sequence.readlines())
|
||||
self.paragraphs = list()
|
||||
for paragraph in debian.deb822.Deb822.iter_paragraphs(sequence):
|
||||
self.paragraphs.append(paragraph)
|
||||
def __init__(self, filename, cleanup):
|
||||
assert os.path.isfile(filename), "%s does not exist." % (filename)
|
||||
self.filename = filename
|
||||
sequence = open(filename)
|
||||
if cleanup:
|
||||
sequence = map(lambda l: l.rstrip(), sequence.readlines())
|
||||
self.paragraphs = list()
|
||||
for paragraph in debian.deb822.Deb822.iter_paragraphs(sequence):
|
||||
self.paragraphs.append(paragraph)
|
||||
|
||||
def save(self, filename=None):
|
||||
if filename:
|
||||
self.filename = filename
|
||||
content = u"\n".join(map(lambda x: x.dump(), self.paragraphs))
|
||||
f = open(self.filename, "w")
|
||||
f.write(content.encode("utf-8"))
|
||||
f.close()
|
||||
def save(self, filename=None):
|
||||
if filename:
|
||||
self.filename = filename
|
||||
content = u"\n".join(map(lambda x: x.dump(), self.paragraphs))
|
||||
f = open(self.filename, "w")
|
||||
f.write(content.encode("utf-8"))
|
||||
f.close()
|
||||
|
||||
def wrap_and_sort(self, wrap_allways=True):
|
||||
for paragraph in self.paragraphs:
|
||||
for field in CONTROL_LIST_FIELDS:
|
||||
if field in paragraph:
|
||||
self._wrap_field(paragraph, field, wrap_allways)
|
||||
if "Uploaders" in paragraph:
|
||||
self._wrap_field(paragraph, "Uploaders", wrap_allways, False)
|
||||
def wrap_and_sort(self, wrap_always, short_indent):
|
||||
for paragraph in self.paragraphs:
|
||||
for field in CONTROL_LIST_FIELDS:
|
||||
if field in paragraph:
|
||||
self._wrap_field(paragraph, field, wrap_always,
|
||||
short_indent)
|
||||
if "Uploaders" in paragraph:
|
||||
self._wrap_field(paragraph, "Uploaders", wrap_always,
|
||||
short_indent, False)
|
||||
|
||||
def _wrap_field(self, control, entry, wrap_allways, sort=True):
|
||||
packages = map(lambda x: x.strip(), control[entry].split(","))
|
||||
if sort:
|
||||
packages = sort_list(packages)
|
||||
def _wrap_field(self, control, entry, wrap_always, short_indent, sort=True):
|
||||
packages = map(lambda x: x.strip(), control[entry].split(","))
|
||||
if sort:
|
||||
packages = sort_list(packages)
|
||||
# Not explicitly disallowed by Policy but known to break QA tools:
|
||||
if "" in packages:
|
||||
packages.remove("")
|
||||
|
||||
lenght = len(entry) + 2 * len(packages) + sum(map(len, packages))
|
||||
if wrap_allways or lenght > 80:
|
||||
indentation = " " * (len(entry) + 2)
|
||||
packages_with_indention = map(lambda x: indentation + x, packages)
|
||||
control[entry] = ",\n".join(packages_with_indention).strip()
|
||||
else:
|
||||
control[entry] = ", ".join(packages).strip()
|
||||
length = len(entry) + 2 * len(packages) + sum(map(len, packages))
|
||||
if wrap_always or length > 80:
|
||||
indentation = " "
|
||||
if not short_indent:
|
||||
indentation *= len(entry) + 2
|
||||
packages_with_indention = map(lambda x: indentation + x, packages)
|
||||
packages_with_indention = ",\n".join(packages_with_indention)
|
||||
if short_indent:
|
||||
control[entry] = "\n" + packages_with_indention
|
||||
else:
|
||||
control[entry] = packages_with_indention.strip()
|
||||
else:
|
||||
control[entry] = ", ".join(packages).strip()
|
||||
|
||||
|
||||
class Install(object):
|
||||
def __init__(self, filename):
|
||||
self.open(filename)
|
||||
def __init__(self, filename):
|
||||
self.open(filename)
|
||||
|
||||
def open(self, filename):
|
||||
assert os.path.isfile(filename), "%s does not exist." % (filename)
|
||||
self.filename = filename
|
||||
self.content = open(filename).readlines()
|
||||
def open(self, filename):
|
||||
assert os.path.isfile(filename), "%s does not exist." % (filename)
|
||||
self.filename = filename
|
||||
self.content = open(filename).readlines()
|
||||
|
||||
def save(self, filename=None):
|
||||
if filename:
|
||||
self.filename = filename
|
||||
f = open(self.filename, "w")
|
||||
f.write("".join(self.content))
|
||||
f.close()
|
||||
def save(self, filename=None):
|
||||
if filename:
|
||||
self.filename = filename
|
||||
f = open(self.filename, "w")
|
||||
f.write("".join(self.content))
|
||||
f.close()
|
||||
|
||||
def sort(self):
|
||||
self.content = sorted(self.content)
|
||||
def sort(self):
|
||||
self.content = sorted(self.content)
|
||||
|
||||
|
||||
def remove_trailing_whitespaces(filename):
|
||||
assert os.path.isfile(filename), "%s does not exist." % (filename)
|
||||
content = open(filename).read().rstrip() + "\n"
|
||||
lines = content.split("\n")
|
||||
lines = map(lambda l: l.rstrip(), lines)
|
||||
new_content = "\n".join(lines)
|
||||
f = open(filename, "w")
|
||||
f.write(new_content)
|
||||
f.close()
|
||||
assert os.path.isfile(filename), "%s does not exist." % (filename)
|
||||
content = open(filename).read().rstrip() + "\n"
|
||||
lines = content.split("\n")
|
||||
lines = map(lambda l: l.rstrip(), lines)
|
||||
new_content = "\n".join(lines)
|
||||
f = open(filename, "w")
|
||||
f.write(new_content)
|
||||
f.close()
|
||||
|
||||
def sort_list(l):
|
||||
normal = filter(lambda x: not x.startswith("${"), l)
|
||||
param = filter(lambda x: x.startswith("${"), l)
|
||||
return sorted(normal) + sorted(param)
|
||||
normal = filter(lambda x: not x.startswith("${"), l)
|
||||
param = filter(lambda x: x.startswith("${"), l)
|
||||
return sorted(normal) + sorted(param)
|
||||
|
||||
def main(script_name, cleanup, wrap_allways, verbose=False):
|
||||
if not os.path.isdir("debian"):
|
||||
print >> sys.stderr, "%s: Error: No debian directory found." % \
|
||||
(script_name)
|
||||
sys.exit(1)
|
||||
def main(script_name, cleanup, wrap_always, short_indent, verbose=False):
|
||||
if not os.path.isdir("debian"):
|
||||
print >> sys.stderr, "%s: Error: No debian directory found." % \
|
||||
(script_name)
|
||||
sys.exit(1)
|
||||
|
||||
control_files = filter(os.path.isfile,
|
||||
["debian/control", "debian/control.in"])
|
||||
for control_file in control_files:
|
||||
if verbose:
|
||||
print control_file
|
||||
control = Control(control_file, cleanup)
|
||||
control.wrap_and_sort(wrap_allways)
|
||||
control.save()
|
||||
control_files = filter(os.path.isfile,
|
||||
["debian/control", "debian/control.in"])
|
||||
for control_file in control_files:
|
||||
if verbose:
|
||||
print control_file
|
||||
control = Control(control_file, cleanup)
|
||||
control.wrap_and_sort(wrap_always, short_indent)
|
||||
control.save()
|
||||
|
||||
copyright_files = filter(os.path.isfile,
|
||||
["debian/copyright", "debian/copyright.in"])
|
||||
for copyright_file in copyright_files:
|
||||
if verbose:
|
||||
print copyright_file
|
||||
remove_trailing_whitespaces(copyright_file)
|
||||
copyright_files = filter(os.path.isfile,
|
||||
["debian/copyright", "debian/copyright.in"])
|
||||
for copyright_file in copyright_files:
|
||||
if verbose:
|
||||
print copyright_file
|
||||
remove_trailing_whitespaces(copyright_file)
|
||||
|
||||
for install_file in sorted(glob.glob("debian/*.install")):
|
||||
if verbose:
|
||||
print install_file
|
||||
install = Install(install_file)
|
||||
install.sort()
|
||||
install.save()
|
||||
install_files = sorted(glob.glob("debian/*.install"))
|
||||
if os.path.isfile("debian/install"):
|
||||
install_files.insert(0, "debian/install")
|
||||
for install_file in install_files:
|
||||
if verbose:
|
||||
print install_file
|
||||
install = Install(install_file)
|
||||
install.sort()
|
||||
install.save()
|
||||
|
||||
if __name__ == "__main__":
|
||||
script_name = os.path.basename(sys.argv[0])
|
||||
usage = "%s [options]" % (script_name)
|
||||
epilog = "See %s(1) for more info." % (script_name)
|
||||
parser = optparse.OptionParser(usage=usage, epilog=epilog)
|
||||
script_name = os.path.basename(sys.argv[0])
|
||||
usage = "%s [options]" % (script_name)
|
||||
epilog = "See %s(1) for more info." % (script_name)
|
||||
parser = optparse.OptionParser(usage=usage, epilog=epilog)
|
||||
|
||||
parser.add_option("-a", "--wrap-allways",
|
||||
help="wrap lists even if they fit into one 80 character long line",
|
||||
dest="wrap_allways", action="store_true", default=False)
|
||||
parser.add_option("-n", "--no-cleanup", help="don't cleanup whitespaces",
|
||||
dest="cleanup", action="store_false", default=True)
|
||||
parser.add_option("-v", "--verbose", help="print more information",
|
||||
dest="verbose", action="store_true", default=False)
|
||||
parser.add_option("-a", "--wrap-always",
|
||||
help="wrap lists even if they fit into one 80 character long line",
|
||||
dest="wrap_always", action="store_true", default=False)
|
||||
parser.add_option("-s", "--short-indent",
|
||||
help="only indent wrapped lines by one space (default is in-line "
|
||||
"with the field name)",
|
||||
dest="short_indent", action="store_true", default=False)
|
||||
parser.add_option("-n", "--no-cleanup", help="don't cleanup whitespaces",
|
||||
dest="cleanup", action="store_false", default=True)
|
||||
parser.add_option("-v", "--verbose", help="print more information",
|
||||
dest="verbose", action="store_true", default=False)
|
||||
|
||||
(options, args) = parser.parse_args()
|
||||
(options, args) = parser.parse_args()
|
||||
|
||||
if len(args) != 0:
|
||||
print >> sys.stderr, "%s: Error: %s: %s" % (script_name,
|
||||
"Unsupported additional parameters specified", ", ".join(args))
|
||||
sys.exit(1)
|
||||
if len(args) != 0:
|
||||
print >> sys.stderr, "%s: Error: %s: %s" % (script_name,
|
||||
"Unsupported additional parameters specified", ", ".join(args))
|
||||
sys.exit(1)
|
||||
|
||||
main(script_name, options.cleanup, options.wrap_allways, options.verbose)
|
||||
main(script_name, options.cleanup, options.wrap_always,
|
||||
options.short_indent, options.verbose)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user