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

[Raphael Geissert]

Author: geissert
Date: 2010-01-07 02:47:26 +0000 (Thu, 07 Jan 2010)
New Revision: 1659

Modified:
   ddpo-by-mail/Makefile
   ddpo-by-mail/pkgtestingstatus.rb
Log:
Fetch the migration information from udd


Modified: ddpo-by-mail/Makefile
===================================================================
--- ddpo-by-mail/Makefile	2010-01-05 22:26:27 UTC (rev 1658)
+++ ddpo-by-mail/Makefile	2010-01-07 02:47:26 UTC (rev 1659)
@@ -26,7 +26,7 @@
 	$(WGET) http://qa.debian.org/data/ddpo/results/$@
 
 testing-status.raw: $(FORCE)
-	$(WGET) http://qa.debian.org/~lucas/$@
+	ssh -oBatchMode=yes $(SSH_UDD_ACCESS_HOST) "psql -At -c \"SELECT * FROM migrations;\" 'service=udd'" > $@
 
 ood/update_output.txt ood/update_excuses.html: ood $(FORCE)
 	cd ood/ && $(WGET) http://release.debian.org/britney/$(subst ood/,,$@)

Modified: ddpo-by-mail/pkgtestingstatus.rb
===================================================================
--- ddpo-by-mail/pkgtestingstatus.rb	2010-01-05 22:26:27 UTC (rev 1658)
+++ ddpo-by-mail/pkgtestingstatus.rb	2010-01-07 02:47:26 UTC (rev 1659)
@@ -130,9 +130,15 @@
   def PkgTestingStatus::read(io)
     pkgs = {}
     io.read.each_line do |l|
-      pkg, t, tv, u, uv, s, sv, fu = l.split(' ')
-      pkgs[pkg] = PkgTestingStatus::new(Date::parse(t), tv, Date::parse(u),
-                                      uv, Date::parse(s), sv, Date::parse(fu))
+      pkg, t, tv, u, uv, s, sv, fu = l.split('|')
+      t  = '0000-01-01' if t.empty?
+      u  = '0000-01-01' if u.empty?
+      s  = '0000-01-01' if s.empty?
+      fu = '0000-01-01' if fu.empty?
+      pkgs[pkg] = PkgTestingStatus::new(Date::parse(t), tv,
+                                        Date::parse(u), uv,
+                                        Date::parse(s), sv,
+                                        Date::parse(fu))
     end
     return pkgs
   end