diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2016-03-23 13:26:55 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2016-03-23 15:21:27 +0300 |
| commit | bc6fd68b03e262b18b5dc6079fb609ac0b181e84 (patch) | |
| tree | ad4a6a9a8dbffaf5fe86107f96f30c570cbd5b21 | |
| parent | e7eb9c334ff2db9b4a622959b74126d5880ef52d (diff) | |
Ignore packages marked as OBSOLETE in cygwin-pkg-maint
Update tests appropriately
| -rw-r--r-- | maintainers.py | 11 | ||||
| -rw-r--r-- | testdata/pkglist/cygwin-pkg-maint | 2 | ||||
| -rw-r--r-- | testdata/pkglist/expected | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/maintainers.py b/maintainers.py index d0afb0f..8bc9ec7 100644 --- a/maintainers.py +++ b/maintainers.py @@ -101,13 +101,18 @@ class Maintainer(object): pkg = match.group(1) m = match.group(2) + # if maintainer starts with a word in all caps, just use that + m = re.sub(r'^([A-Z]+)\b.*$', r'\1', m) + + # ignore packages marked as 'OBSOLETE' + if m == 'OBSOLETE': + continue + # orphaned packages get the default maintainer if we have # one, otherwise are assigned to 'ORPHANED' - if m.startswith('ORPHANED'): + if m == 'ORPHANED': if orphanMaint is not None: m = orphanMaint - else: - m = 'ORPHANED' # joint maintainers are separated by '/' for name in m.split('/'): diff --git a/testdata/pkglist/cygwin-pkg-maint b/testdata/pkglist/cygwin-pkg-maint index d2375af..41b4175 100644 --- a/testdata/pkglist/cygwin-pkg-maint +++ b/testdata/pkglist/cygwin-pkg-maint @@ -1744,7 +1744,7 @@ presentproto Yaakov Selkowitz prison Yaakov Selkowitz pristine-tar Jari Aalto procmail Daniel Boland -procps Corinna Vinschen +procps OBSOLETE (Corinna Vinschen) proj Marco Atzeri protobuf ORPHANED (Reini Urban) pscan Jari Aalto diff --git a/testdata/pkglist/expected b/testdata/pkglist/expected index 4e8db92..b340aa2 100644 --- a/testdata/pkglist/expected +++ b/testdata/pkglist/expected @@ -9,7 +9,7 @@ 'Chris LeBlanc': maintainers.Maintainer('Chris LeBlanc', [], ['python-h5py', 'python3-h5py']), 'Christian Franke': maintainers.Maintainer('Christian Franke', [], ['busybox', 'cdrkit', 'ddrescue', 'hostname', 'isomaster', 'ncdu', 'postfix', 'smartmontools']), 'Christian Kellermann': maintainers.Maintainer('Christian Kellermann', [], ['chicken']), - 'Corinna Vinschen': maintainers.Maintainer('Corinna Vinschen', [], ['attr', 'base-cygwin', 'catgets', 'cpio', 'crypt', 'csih', 'cygrunsrv', 'cygwin', 'cygwin-devel', 'editrights', 'email', 'eventlog', 'fetchmail', 'file', 'gawk', 'gdb', 'getent', 'ipc-utils', 'libedit', 'login', 'lynx', 'mt', 'nc', 'nc6', 'openssh', 'openssl', 'patch', 'pl', 'procps', 'psmisc', 'rebase', 'recode', 'rlwrap', 'rng-tools', 'robots', 'sed', 'ssmtp', 'syslog-ng', 'tcsh', 'tin', 'tzcode', 'windows-default-manifest', 'xinetd']), + 'Corinna Vinschen': maintainers.Maintainer('Corinna Vinschen', [], ['attr', 'base-cygwin', 'catgets', 'cpio', 'crypt', 'csih', 'cygrunsrv', 'cygwin', 'cygwin-devel', 'editrights', 'email', 'eventlog', 'fetchmail', 'file', 'gawk', 'gdb', 'getent', 'ipc-utils', 'libedit', 'login', 'lynx', 'mt', 'nc', 'nc6', 'openssh', 'openssl', 'patch', 'pl', 'psmisc', 'rebase', 'recode', 'rlwrap', 'rng-tools', 'robots', 'sed', 'ssmtp', 'syslog-ng', 'tcsh', 'tin', 'tzcode', 'windows-default-manifest', 'xinetd']), 'Damien Doligez': maintainers.Maintainer('Damien Doligez', [], ['ocaml']), 'Daniel Boland': maintainers.Maintainer('Daniel Boland', [], ['libfakesu', 'procmail', 'sendmail']), 'Dave Kilroy': maintainers.Maintainer('Dave Kilroy', [], ['chere']), |