From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 54812 invoked by alias); 8 May 2016 12:40:27 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 54677 invoked by uid 9795); 8 May 2016 12:40:22 -0000 Date: Sun, 08 May 2016 12:40:00 -0000 Message-ID: <20160508124022.54651.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. d8b998ded7d572db2c11f97f558510ce28751a1c X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4b71e7852fd658e061595d0c6217081dd7f56b60 X-Git-Newrev: d8b998ded7d572db2c11f97f558510ce28751a1c X-SW-Source: 2016-q2/txt/msg00013.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=d8b998ded7d572db2c11f97f558510ce28751a1c commit d8b998ded7d572db2c11f97f558510ce28751a1c Author: Jon Turney Date: Sun May 8 12:37:32 2016 +0000 Report any lines with an unknown package status in cygwin-pkg-maint Diff: --- maintainers.py | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/maintainers.py b/maintainers.py index a078376..3d6d9c1 100644 --- a/maintainers.py +++ b/maintainers.py @@ -105,17 +105,21 @@ class Maintainer(object): 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 == 'ORPHANED': - if orphanMaint is not None: - m = orphanMaint + (m, n) = re.subn(r'^([A-Z]+)\b.*$', r'\1', m) + if n > 0: + # ignore packages marked as 'OBSOLETE' + if m == 'OBSOLETE': + continue + + # orphaned packages get the default maintainer if we have + # one, otherwise are assigned to 'ORPHANED' + elif m == 'ORPHANED': + if orphanMaint is not None: + m = orphanMaint + + else: + logging.error("unknown package status '%s' in line %s:%d: '%s'" % (m, pkglist, i, l)) + continue # joint maintainers are separated by '/' for name in m.split('/'):