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

[lucas at alioth.debian.org]

Author: lucas
Date: 2008-05-01 09:07:40 +0000 (Thu, 01 May 2008)
New Revision: 844

Modified:
   ddpo-by-mail/ddpo-config.rb
   ddpo-by-mail/reminder-mail.rb
Log:
made text less verbose

Modified: ddpo-by-mail/ddpo-config.rb
===================================================================
--- ddpo-by-mail/ddpo-config.rb	2008-04-29 16:48:36 UTC (rev 843)
+++ ddpo-by-mail/ddpo-config.rb	2008-05-01 09:07:40 UTC (rev 844)
@@ -46,10 +46,10 @@
 EXC_EMAILS_PKGS['pkg-xen-devel at lists.alioth.debian.org'] = ['xen-unstable']
 EXC_EMAILS_PKGS['tomasera at debian.org'] = ['xinetd']
 
-BUG_AGE = 15
+BUG_AGE = 7
 AGE_IN_DEBIAN = 20
-LAST_IN_SYNC = 30
-LAST_IN_SYNC_SERIOUS = 40
+LAST_IN_SYNC = 20
+LAST_IN_SYNC_SERIOUS = 30
 # etch released on 2007-04-08. So
 # (Date::today - Date::parse('2007-04-08')).to_i
 

Modified: ddpo-by-mail/reminder-mail.rb
===================================================================
--- ddpo-by-mail/reminder-mail.rb	2008-04-29 16:48:36 UTC (rev 843)
+++ ddpo-by-mail/reminder-mail.rb	2008-05-01 09:07:40 UTC (rev 844)
@@ -7,7 +7,7 @@
 require 'dehs'
 
 # fetch updated files from www
-update_data
+#update_data
 
 # parse debian-installer packages
 pkg = nil
@@ -107,13 +107,8 @@
   gtext =<<-EOF
 From: DDPOMail robot <lucas-ddpomail at debian.org>
 To: "#{maintainers_name[email]}" <#{email}>
-Subject: Some of your Debian packages might need attention
+Subject: Possible problems in your Debian packages
 
-Dear #{maintainers_name[email]},
-
-The following possible problem(s) were detected in the package(s)
-you maintain in Debian:
-
   EOF
   maintainers_pkg[email].each do |pkg|
     if pkg =~ /#/
@@ -129,12 +124,13 @@
 #    end
 #    exit 0
 #  end
+  dehstext = ''
   mpkgs.keys.sort.each do |pkg|
     next if issues[pkg].nil?
     # skip if excluded
     next if EXC_EMAILS_PKGS[email].include?(pkg)
     if not mpkgs[pkg]
-      comaint = ' (you co-maintain this package)'
+      comaint = ' (you co-maintain it)'
       only_uploader = false if haslist[pkg].nil? and serious[pkg]
     else
       comaint = ''
@@ -142,32 +138,39 @@
     end
     mserious = mserious || serious[pkg]
     ptext = "=== #{pkg}:#{comaint}\n"
+    incptext = false
     testingpl = false
     issues[pkg].each do |iss|
       if iss[0] == :bugs
-        ptext += "= This package has #{iss[1].length} bug(s) that should be fixed for the next Debian release:\n"
+        incptext = true
+        ptext += "= #{iss[1].length} bug(s) that should be fixed for the next Debian release:\n"
         iss[1].each do |b|
           ptext += "- ##{b[0]} <http://bugs.debian.org/#{b[0]}>\n"
           ptext += "  #{bugtitles[b[0]]}\n"
           if b[2] == "RC"
-            ptext += "  This is a Release-Critical bug!\n"
+	    # add nothing
           elsif b[2] == "PROP"
 	    # add nothing
           else
-            ptext += "  Bug part of a release goal: #{b[2]}\n"
+            ptext += "  Part of release goal: #{b[2]}\n"
           end
         end
       elsif iss[0] == :not_testing
-        ptext += "= This package has not been in testing for #{iss[2]} days.\n"
+        incptext = true
+        ptext += "= Not in testing for #{iss[2]} days.\n"
         ptext += "  If things don't change, it won't be part of lenny!\n"
         testingpl = true
       elsif iss[0] == :no_migration
-        ptext += "= This package has not been able to migrate from unstable\n"
-        ptext += "  to testing for #{iss[2]} days.\n"
+        incptext = true
+        ptext += "= No migration to testing for #{iss[2]} days.\n"
         testingpl = true
       elsif iss[0] == :dehs
-        ptext += "= A newer upstream version exists for this package (or your watch file\n   is broken):\n"
-        ptext += "  upstream: #{iss[2]} Debian: #{iss[1]}\n"
+        if dehstext == ''
+          dehstext = <<-EOF
+=== Packages with a new upstream version according to DEHS:
+          EOF
+        end
+        dehstext += "  #{pkg}  #{iss[2]}  (Debian: #{iss[1]})\n"
       else
         raise "Unknown issue #{iss[0]}!"
       end
@@ -175,8 +178,10 @@
     if testingpl
       ptext += "  See <http://release.debian.org/migration/testing.pl?package=#{pkg}>\n"
     end
-    gtext += ptext
-    gtext += "\n"
+    if incptext
+      gtext += ptext
+      gtext += "\n"
+    end
   end
   if not mserious
     puts "Skipping mail for #{email}, has only non-serious issues."
@@ -190,7 +195,12 @@
     puts "Skipping mail for #{email}, IS EXCLUDED"
     next
   end
+  # add dehs text
+  if dehstext != ''
+    gtext += dehstext + "\n"
+  end
   gtext += <<-EOF
+------------ interesting stuff probably ends here ------------
 This is an automated mail. These mails are sent monthly.
 For more information about these mails, refer to
 http://wiki.debian.org/qa.debian.org/DdpoByMail