This is the mail archive of the cygwin-apps-cvs mailing list for the cygwin-apps project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[calm - Cygwin server-side packaging maintenance script] branch master, updated. d8b998ded7d572db2c11f97f558510ce28751a1c




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=d8b998ded7d572db2c11f97f558510ce28751a1c

commit d8b998ded7d572db2c11f97f558510ce28751a1c
Author: Jon Turney <jon.turney@dronecode.org.uk>
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('/'):


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]