[DRE-commits] [SCM] Tracking the Debian/Ruby wheezy transition branch, master, updated. e294aa03d3b7faac58b956a2e62be92b990315f9

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit e294aa03d3b7faac58b956a2e62be92b990315f9
Author: Lucas Nussbaum <lucas at alioth.debian.org>
Date:   Sat Apr 9 08:13:29 2011 +0000

    Transition tracker improvements
    
    * fix logic for excluding transitioned packages
    * show binary package popcon

diff --git a/details.html.erb b/details.html.erb
index 61f4d0a..ce11b79 100644
--- a/details.html.erb
+++ b/details.html.erb
@@ -54,6 +54,7 @@
         <td><%= package['source'] %></th>
         <td><%= package['binary'] %></th>
         <td><%= package['arch'] %></th>
+        <td><%= package['popcon'] %></th>
         <td><%= package['maintainer'] %></th>
         <td><%= package['uploaders'] %></th>
       </tr>
diff --git a/retrieve.rb b/retrieve.rb
index 96cf421..bf35f33 100644
--- a/retrieve.rb
+++ b/retrieve.rb
@@ -18,21 +18,22 @@ connection = PGconn.open(:service => 'udd')
 
 pending_packages_query = <<EOF
 select distinct s.source as source, p.package as binary, s.architecture as arch, coalesce(pc.insts, 0) as popcon, s.maintainer as maintainer, s.uploaders as uploaders
-from packages p, sources_uniq s
-left join sources_popcon pc on (s.source = pc.source)
+from sources_uniq s, packages p
+left join popcon pc on (p.package = pc.package)
 where s.distribution = 'debian' and s.release='sid'
 and p.distribution = 'debian' and p.release='sid' and s.source = p.source
 and (s.source ~ 'lib.*-ruby' or p.package ~ 'lib.*-ruby.*' or s.build_depends ~ '.*ruby-pkg-tools.*' or s.build_depends_indep ~ '.*ruby-pkg-tools.*' or p.depends ~ '.*ruby1.8.*')
-order by source, package;
+order by source, p.package;
 EOF
 
 done_packages_query = <<EOF
-select distinct s.source as source, p.package as binary, s.architecture as arch, s.maintainer as maintainer, s.uploaders as uploaders
-from packages p, sources_uniq s
+select distinct s.source as source, p.package as binary, s.architecture as arch, coalesce(pc.insts, 0) as popcon, s.maintainer as maintainer, s.uploaders as uploaders
+from sources_uniq s, packages p
+left join popcon pc on (p.package = pc.package)
 where s.distribution = 'debian' and s.release='sid'
 and p.distribution = 'debian' and p.release='sid' and s.source = p.source
 and (s.build_depends ~ '.*gem2deb.*')
-order by source, package;
+order by source, p.package;
 EOF
 
 pending_packages = connection.exec(pending_packages_query)
@@ -40,7 +41,8 @@ done_packages = connection.exec(done_packages_query)
 
 done_source_packages = done_packages.map { |pkg| pkg['source'] }.uniq
 pending_packages = pending_packages.to_a
-pending_packages.reject! { |pkg| done_source_packages.include?(pkg['source']) }
+done_binary_packages = done_packages.map { |pkg| pkg['binary'] }
+pending_packages.reject! { |pkg| done_binary_packages.include?(pkg['binary']) }
 pending_source_packages = pending_packages.map { |pkg| pkg['source'] }.uniq
 
 new_time_data = {

-- 
Tracking the Debian/Ruby wheezy transition