[Collab-qa-commits] r2286 - udd/udd

[Andreas Tille]

Author: tille
Date: 2012-05-08 13:41:18 +0000 (Tue, 08 May 2012)
New Revision: 2286

Modified:
   udd/udd/blends_prospective_gatherer.py
Log:
Detect some more ITPs


Modified: udd/udd/blends_prospective_gatherer.py
===================================================================
--- udd/udd/blends_prospective_gatherer.py	2012-05-08 10:46:21 UTC (rev 2285)
+++ udd/udd/blends_prospective_gatherer.py	2012-05-08 13:41:18 UTC (rev 2286)
@@ -47,7 +47,9 @@
     my_config = self.my_config
     cur = self.cursor()
 
-    find_itp_re = re.compile('\s+\*\s+initial\s+release.+closes:\s+#(\d+)', flags=re.IGNORECASE|re.MULTILINE)
+    find_itp_re = re.compile('\s+\*\s+.*(initial\s+release|ITP).+closes:\s+(Bug|)#(\d+)', flags=re.IGNORECASE|re.MULTILINE)
+    # might need enhancement (see http://www.debian.org/doc/manuals/developers-reference/pkgs.html#upload-bugfix)
+    # --> /closes:\s*(?:bug)?\#\s*\d+(?:,\s*(?:bug)?\#\s*\d+)*/ig
     vcs_type_re = re.compile('Vcs-(Svn|Git|Bzr|Darcs|Hg|Cvs|Arch|Mtn)')
     
     cur.execute('TRUNCATE %s' % my_config['table'])
@@ -106,7 +108,7 @@
           match = find_itp_re.search(changes)
           sprosp['wnpp'] = 0
           if match:
-            wnpp = match.groups()[0]
+            wnpp = match.groups()[2]
             if wnpp not in sprosp['closes']:
               self.log.warning("Strange WNPP in changelog of '%s': wnpp=%s - closed bugs=%s" % (source, wnpp, str(sprosp['closes'])))
             try: