Sort Architecture (LP: #681131)

This commit is contained in:
Stefano Rivera 2010-11-26 18:03:28 +02:00
parent 7e8423a470
commit a27c19cb5c
2 changed files with 6 additions and 1 deletions

3
debian/changelog vendored
View File

@ -9,6 +9,7 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low
- Add one-space-indentation option: --short-indent - Add one-space-indentation option: --short-indent
- Remove null-entry from trailing comma in sorted lists - Remove null-entry from trailing comma in sorted lists
- Add configurable debian directory location - Add configurable debian directory location
- Sort Architecture (LP: #681131)
* dgetlp, grab-merge, pull-lp-source, syncpackage: Export DEB_VENDOR=Ubuntu * dgetlp, grab-merge, pull-lp-source, syncpackage: Export DEB_VENDOR=Ubuntu
when unpacking source packages. 3.0 (quilt) has optional per-vendor patch when unpacking source packages. 3.0 (quilt) has optional per-vendor patch
series. series.
@ -17,7 +18,7 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low
* wrap-and-sort: Remove duplicate items from sorted lists. * wrap-and-sort: Remove duplicate items from sorted lists.
* syncpackage: Fix error message for failed downloads. * syncpackage: Fix error message for failed downloads.
-- Benjamin Drung <bdrung@ubuntu.com> Thu, 25 Nov 2010 23:48:55 +0100 -- Stefano Rivera <stefanor@ubuntu.com> Fri, 26 Nov 2010 18:01:54 +0200
ubuntu-dev-tools (0.106) experimental; urgency=low ubuntu-dev-tools (0.106) experimental; urgency=low

View File

@ -63,6 +63,10 @@ class Control(object):
if "Uploaders" in paragraph: if "Uploaders" in paragraph:
self._wrap_field(paragraph, "Uploaders", wrap_always, self._wrap_field(paragraph, "Uploaders", wrap_always,
short_indent, False) short_indent, False)
if "Architecture" in paragraph:
archs = set(paragraph["Architecture"].split())
paragraph["Architecture"] = " ".join(
sorted(archs, key=lambda x: (1 - int("any" in x), x)))
def _wrap_field(self, control, entry, wrap_always, short_indent, sort=True): def _wrap_field(self, control, entry, wrap_always, short_indent, sort=True):
packages = map(lambda x: x.strip(), control[entry].split(",")) packages = map(lambda x: x.strip(), control[entry].split(","))