[Collab-qa-commits] r336 - ddpo-by-mail

[lucas at alioth.debian.org]

Author: lucas
Date: 2007-07-16 23:04:22 +0000 (Mon, 16 Jul 2007)
New Revision: 336

Modified:
   ddpo-by-mail/ddpo-config.rb
   ddpo-by-mail/reminder-mail.rb
Log:
ddpo-by-mail updates:
- better uploaders handling
- spelling fixes


Modified: ddpo-by-mail/ddpo-config.rb
===================================================================
--- ddpo-by-mail/ddpo-config.rb	2007-07-16 07:09:29 UTC (rev 335)
+++ ddpo-by-mail/ddpo-config.rb	2007-07-16 23:04:22 UTC (rev 336)
@@ -8,19 +8,23 @@
 # Maintainers who unsubscribed, or dummy maintainers
 EXC_EMAILS = [
   'marillat at debian.org',
-  'mpalmer at debian.org'
+  'mpalmer at debian.org',
+  'gurkan at linuks.mine.nu'
 ]
 
 EXC_BUGS = [
-  '368560', #debian-x at lists.debian.org
+  '368560', # debian-x at lists.debian.org
   '368559',
   '211765',
   '368564',
-  '383465'
+  '383465',
+  '429023' # ivan-debian at 420.am
+
 ]
 
 EXC_EMAILS_PKGS = Hash::new { [] }
 EXC_EMAILS_PKGS['debian-gcc at lists.debian.org'] = ['gcc-2.95', 'gcc-snapshot' ]
+EXC_EMAILS_PKGS['pkg-request-tracker-maintainers at lists.alioth.debian.org'] = ['request-tracker3.4' ]
 
 SENDMAIL = true
 WRITEDDLIST = true

Modified: ddpo-by-mail/reminder-mail.rb
===================================================================
--- ddpo-by-mail/reminder-mail.rb	2007-07-16 07:09:29 UTC (rev 335)
+++ ddpo-by-mail/reminder-mail.rb	2007-07-16 23:04:22 UTC (rev 336)
@@ -79,6 +79,15 @@
   maintainers_name[email] = realname
 end
 
+# Get maintainer for each package
+haslist = {}
+maintainers_pkg.keys.each do |email|
+  maintainers_pkg[email].each do |pkg|
+    pkg = pkg.chop if pkg =~ /#/
+    haslist[pkg] = true if email =~ /@list.*\.debian\.org$/
+  end
+end
+
 # parse popcon
 def getpopcon
   s = IO::read('popcon_by_inst')
@@ -86,11 +95,11 @@
   binpkg = {}
   pkg.each_line do |l|
     next if l =~ /^\)\[/
-      src = l.match(/^([^\(]*)\(/)[1]
-                       bin = l.match(/\(([^\)]*)\)/)[1]
-                       bin.split(/, /).each do |b|
-                         binpkg[b] = src
-                       end
+    src = l.match(/^([^\(]*)\(/)[1]
+    bin = l.match(/\(([^\)]*)\)/)[1]
+    bin.split(/, /).each do |b|
+      binpkg[b] = src
+    end
   end
   popcon = Hash::new { 0 }
   s.each_line do |l|
@@ -135,6 +144,9 @@
     mpkgs = {}
     gissues = 0
     only_uploader = true
+    if email =~ /@list.*\.debian\.org$/
+      only_uploader = false
+    end
     gtext =<<-EOF
 From: DDPOMail robot <lucas-ddpomail at debian.org>
 To: "#{maintainers_name[email]}" <#{email}>
@@ -160,6 +172,7 @@
       #next if not mpkgs[p] # skip if only uploader
       if not mpkgs[p]
         comaint = ' (you co-maintain this package)'
+        only_uploader = false if haslist[p].nil?
       else
         comaint = ''
         only_uploader = false
@@ -185,7 +198,7 @@
     end
     if gissues > 0
       gtext += <<-EOF
-This is an semi-automated mail. These mails will be sent monthly.
+This is a semi-automated mail. These mails will be sent monthly.
 For more information about these mails, refer to
 http://wiki.debian.org/qa.debian.org/DdpoByMail
 
@@ -193,8 +206,8 @@
 avoidable (that we can detect easily that the problems weren't
 actually problems), please reply to it and let us know.
 
-If you don't want to receive this type of mail anymore, you can reply
-to this mail and use one of the following commands at the beggining of
+If you don't want to receive this type of mail any more, you can reply
+to this mail and use one of the following commands at the beginning of
 the mail:
 - unsubscribe <email>
 You will no longer receive any mail for any package
@@ -204,6 +217,7 @@
 receive anything.
 - ignore <bug> <email>
 You will no longer receive information about this bug.
+
 All commands are manually processed, but you will receive
 confirmation. The commands are just here so that we know precisely
 what you want.
@@ -212,7 +226,7 @@
 See: 
 http://qa.debian.org/developer.php?login=#{email}
 
-Don't hesitate to reply to that mail if you have questions. The wiki
+Don't hesitate to reply to this mail if you have questions. The wiki
 page will be updated with useful information.
 -- 
 DDPOMail, run by Lucas Nussbaum