[SCM] ci-tooling packaging branch, master, updated. 079cb8cfed12a369c0b977b94ec4fbec9bd751af

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 079cb8cfed12a369c0b977b94ec4fbec9bd751af
Author: Rohan Garg <rohan at garg.io>
Date:   Mon Apr 13 13:58:18 2015 +0200

    Fix Debian build logic
---
 dci/mozilla.rb | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 516d979..2b4f179 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -42,17 +42,14 @@ 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
@@ -69,7 +66,8 @@ end
 def bump_version
   changelog = Changelog.new
   version = "#{changelog.version(Changelog::EPOCH)}1000~#{changelog.version(Changelog::BASE)}"
-  if DEBIAN_RELEASES.include? RELEASE
+  # Need to check if the original release is a debian release
+  if DEBIAN_RELEASES.include? ARGV[2]
     version += '-1'
     File.open('debian/config/mozconfig.in', 'a') { |f|
       f.puts("ac_add_options --enable-gstreamer=1.0
")
@@ -197,9 +195,7 @@ system("apt-get -y install #{packages.join(' ')}")
 UBUNTU_RELEASES = `ubuntu-distro-info -a`.split
 DEBIAN_RELEASES = `debian-distro-info -a`.split
 
-RELEASE = (DEBIAN_RELEASES.include? ARGV[2]) ? ARGV[2] : UBUNTU_RELEASES[-1]
-
-$logger.info("Building for #{RELEASE}")
+RELEASE = (DEBIAN_RELEASES.include? ARGV[2]) ? UBUNTU_RELEASES[-1] : ARGV[2]
 
 release_info = package_releases
 if release_info[:ubuntu] < release_info[:upstream]

-- 
ci-tooling packaging