[SCM] ci-tooling packaging branch, master, updated. 82cce0cd17e6dbf85c584a2bf5b632ac42f6090a

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 82cce0cd17e6dbf85c584a2bf5b632ac42f6090a
Author: Rohan Garg <rohan at garg.io>
Date:   Mon Apr 13 13:42:37 2015 +0200

    Fix rmadison call for debian systems
---
 dci/mozilla.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 3d728f2..154b96c 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -42,14 +42,17 @@ def package_releases
     $logger.info("Upstream #{upstream_versions}")
   end
 
+  # Need this here because rmadison will crap itself when checking a Debian
+  # release against a Ubuntu rmadison instance
+  release = DEBIAN_RELEASES.include? RELEASE ? UBUNTU_RELEASES[-1] : RELEASE
   threads << Thread.new do
-    `rmadison -u ubuntu -a amd64 -s #{RELEASE} #{PACKAGE}`.to_str.each_line do | line |
+    `rmadison -u ubuntu -a amd64 -s #{release} #{PACKAGE}`.to_str.each_line do | line |
       match_data = line.match('(\d+[.]\d+)')
       ubuntu_versions <<  match_data[0].to_f unless match_data.nil?
     end
 
     # Make sure we take the updates suite into account too
-    `rmadison -u ubuntu -a amd64 -s #{RELEASE}-updates #{PACKAGE}`.to_str.each_line do | line |
+    `rmadison -u ubuntu -a amd64 -s #{release}-updates #{PACKAGE}`.to_str.each_line do | line |
       match_data = line.match('(\d+[.]\d+)')
       ubuntu_versions <<  match_data[0].to_f unless match_data.nil?
     end

-- 
ci-tooling packaging