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

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 777c27b1130fee5ca65fda7b0d52cb0dd70cc34b
Author: Lucas Nussbaum <lucas at alioth.debian.org>
Date:   Wed Apr 27 05:57:10 2011 +0000

    improve output

diff --git a/details.html.erb b/details.html.erb
index f6c9f56..150bc36 100644
--- a/details.html.erb
+++ b/details.html.erb
@@ -62,6 +62,7 @@
       <li>Migrated binary packages: <%= done_packages.count %></li>
       <li>Migrated source packages: <%= done_source_packages.count %></li>
     </ul>
+   (listing does not include transitional packages)
     <table class='buglist'>
       <tr>
         <th>source</th>
diff --git a/retrieve.rb b/retrieve.rb
index 0bd9338..81008a4 100644
--- a/retrieve.rb
+++ b/retrieve.rb
@@ -7,6 +7,9 @@ require 'erb'
 
 data = []
 
+# list of source packages that don't need to be migrated
+DONT_MIGRATE_SRC = ['ruby-defaults', 'ruby1.8', 'ruby1.9.1', 'gem2deb' ]
+
 # accumulate data series points
 if File.exists?('data.json')
   FileUtils.cp('data.json', 'data.json~')
@@ -27,7 +30,7 @@ order by source, p.package;
 EOF
 
 done_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
+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, p.description as descr
 from sources_uniq s, packages p
 left join popcon pc on (p.package = pc.package)
 where s.distribution = 'debian' and s.release='sid'
@@ -49,6 +52,7 @@ done_source_packages = done_packages.map { |pkg| pkg['source'] }.uniq
 pending_packages = pending_packages.to_a
 done_binary_packages = done_packages.map { |pkg| pkg['binary'] }
 pending_packages.reject! { |pkg| done_binary_packages.include?(pkg['binary']) }
+pending_packages.reject! { |pkg| DONT_MIGRATE_SRC.include?(pkg['source']) }
 pending_source_packages = pending_packages.map { |pkg| pkg['source'] }.uniq
 
 pending_packages_team = pending_packages.select { |pkg| pkg['maintainer'] =~ /pkg-ruby-extras/ or pkg['uploaders'] =~ /pkg-ruby-extras/ }
@@ -61,6 +65,9 @@ new_time_data = {
 }
 data << new_time_data
 
+# filter out transitional done packages
+done_packages = done_packages.reject { |pkg| pkg['descr'] =~ /Transitional package/ }
+
 # write data files
 File.open('data.json', 'w') do |f|
   f.write(data.to_json)

-- 
Tracking the Debian/Ruby wheezy transition