[SCM] ci-tooling packaging branch, master, updated. 79922506a57448282b19878f89ac41463fb02328

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=906b0bf

The following commit has been merged in the master branch:
commit 906b0bf5be94ed1e94e3414b8e908cebb7bc9cb9
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Feb 25 13:42:15 2015 +0100

    fix a stupid bug where arch specific builds are always unsuitable
    
    also add some debug to make sure this doesn't go unnoticed again
---
 kci/daily-qa.rb      | 7 +++++--
 kci/install_check.rb | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/kci/daily-qa.rb b/kci/daily-qa.rb
index 2b3dadf..6904d43 100755
--- a/kci/daily-qa.rb
+++ b/kci/daily-qa.rb
@@ -95,7 +95,7 @@ class CiPPA
       series = Launchpad::Rubber.from_url("https://api.launchpad.net/devel/ubuntu/#{@series}")
       # FIXME: arch hardcode
       reference_distro_arch_series_link =
-        Launchpad::Rubber.from_url("#{series.self_link}/amd64")
+        Launchpad::Rubber.from_url("#{series.self_link}/amd64").self_link
       ppa = Launchpad::Rubber.from_url("https://api.launchpad.net/devel/~kubuntu-ci/+archive/ubuntu/#{@type}")
 
       packages = {}
@@ -117,6 +117,7 @@ class CiPPA
       until binary_queue.empty?
         binaries = binary_queue.pop(true)
         binaries.each do |binary|
+          logger.info "#{binary.binary_package_name}  || #{binary.architecture_specific}||  #{binary.distro_arch_series_link}"
           # Do not include debug packages, they can't conflict anyway, and if
           # they did we still wouldn't care.
           next if binary.binary_package_name.end_with?('-dbg')
@@ -129,7 +130,9 @@ class CiPPA
           next if binary.binary_package_name == 'kubuntu-ci-live'
           next if binary.binary_package_name == 'kubuntu-plasma5-desktop'
           if binary.architecture_specific
-            next unless binary.distro_arch_series_link == reference_distro_arch_series_link
+            unless binary.distro_arch_series_link == reference_distro_arch_series_link
+              logger.info '  skipping unsuitable arch'
+            end
           end
           packages[binary.binary_package_name] = binary.binary_package_version
         end
diff --git a/kci/install_check.rb b/kci/install_check.rb
index 7b38699..3a349fe 100755
--- a/kci/install_check.rb
+++ b/kci/install_check.rb
@@ -71,6 +71,7 @@ class CiPPA
     until binary_queue.empty?
       binaries = binary_queue.pop(true)
       binaries.each do |binary|
+        LOG.info "#{binary.binary_package_name}  || #{binary.architecture_specific}||  #{binary.distro_arch_series_link}"
         # Do not include debug packages, they can't conflict anyway, and if
         # they did we still wouldn't care.
         next if binary.binary_package_name.end_with?('-dbg')
@@ -82,7 +83,10 @@ class CiPPA
         next if binary.binary_package_name == 'kubuntu-ci-live'
         next if binary.binary_package_name == 'kubuntu-plasma5-desktop'
         if binary.architecture_specific
-          next unless binary.distro_arch_series_link == host_arch
+          unless binary.distro_arch_series_link == host_arch.self_link
+            LOG.info '  skipping unsuitable arch of bin'
+            next
+          end
         end
         packages[binary.binary_package_name] = binary.binary_package_version
       end

-- 
ci-tooling packaging