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

[Lucas Nussbaum]

Author: lucas
Date: 2010-03-23 22:03:12 +0000 (Tue, 23 Mar 2010)
New Revision: 1729

Removed:
   ddpo-by-mail/dehs.rb
Modified:
   ddpo-by-mail/reminder-mail.rb
   ddpo-by-mail/udddata.rb
Log:
use udd for dehs data

Deleted: ddpo-by-mail/dehs.rb
===================================================================
--- ddpo-by-mail/dehs.rb	2010-03-22 11:22:24 UTC (rev 1728)
+++ ddpo-by-mail/dehs.rb	2010-03-23 22:03:12 UTC (rev 1729)
@@ -1,24 +0,0 @@
-# parse testing status
-require 'ddpo-config'
-require 'date'
-require 'pp'
-
-def get_dehs
-  dehs = {}
-  IO::read('data/dehs.txt').each_line do |l|
-    pkg, unstable, upstream, date = l.chomp.split('|')
-    serious = false
-    if date != "1970-01-01 00:00:00"
-      d = Date::parse(date)
-      # FIXME add test if Date::today - d > DIFF, then serious = true
-    end
-    dehs[pkg] = [ unstable, upstream, serious ]
-  end
-  return dehs
-end
-
-if $0 == __FILE__
-  dehs = get_dehs
-  pp dehs
-end
-

Modified: ddpo-by-mail/reminder-mail.rb
===================================================================
--- ddpo-by-mail/reminder-mail.rb	2010-03-22 11:22:24 UTC (rev 1728)
+++ ddpo-by-mail/reminder-mail.rb	2010-03-23 22:03:12 UTC (rev 1729)
@@ -4,7 +4,6 @@
 
 require 'ddpo-config'
 require 'bugs'
-require 'dehs'
 require 'udddata'
 
 udd = UDDData::new
@@ -47,6 +46,7 @@
 subscribers = udd.pts
 builds = udd.missing_builds
 lintian = udd.lintian
+dehs = udd.dehs
 
 # get removals
 rms = []
@@ -68,7 +68,6 @@
 =end
 
 bugs = parse_bugs
-dehs = get_dehs
 
 # compute testing issues
 testingissues = {}
@@ -123,7 +122,6 @@
   end
   if dehs[pkg]
     pissues << [ :dehs, dehs[pkg][0], dehs[pkg][1] ]
-    pserious ||= dehs[pkg][2]
   end
   if lintian[pkg]
     pissues << [ :lintian, lintian[pkg][0], lintian[pkg][1] ]

Modified: ddpo-by-mail/udddata.rb
===================================================================
--- ddpo-by-mail/udddata.rb	2010-03-22 11:22:24 UTC (rev 1728)
+++ ddpo-by-mail/udddata.rb	2010-03-23 22:03:12 UTC (rev 1729)
@@ -3,7 +3,7 @@
 require 'pp'
 
 class UDDData
-  attr_reader :maintainers, :uploaders, :names, :testing_status, :missing_builds, :lintian, :debian_installer_sources, :pts
+  attr_reader :maintainers, :uploaders, :names, :testing_status, :missing_builds, :lintian, :debian_installer_sources, :pts, :dehs
 
   def initialize
     @dbh = DBI::connect('DBI:Pg:dbname=udd;port=5441;host=localhost', 'guestdd', ENV['dbpw'])
@@ -15,6 +15,7 @@
     @lintian = {}
     @debian_installer_sources = []
     @pts = Hash::new { [] }
+    @dehs = {}
   end
 
   def fetch
@@ -62,6 +63,10 @@
       @pts[r['email']] = [] if @pts[r['email']].empty?
       @pts[r['email']] << r['source']
     end
+    # dehs
+    @dbh.select_all("select source, unstable_version, unstable_upstream from dehs where unstable_status = 'outdated'") do |r|
+      @dehs[r['source']] = [ r['unstable_version'], r['unstable_upstream']]
+    end
   end
 end
 
@@ -70,6 +75,6 @@
   t = Time::now
   udd.fetch
   te = Time::now
-  pp udd.pts
+  pp udd.dehs
   puts te - t
 end