[SCM] ci-tooling packaging branch, master, updated. 55dcca042276bf0e6898e86602ecd842f29f423e

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 55dcca042276bf0e6898e86602ecd842f29f423e
Author: Rohan Garg <rohan at kde.org>
Date:   Mon Jan 26 00:48:22 2015 +0100

    Instead of using lsb_release to figure out the release, use the var that was passed
---
 dci/mozilla.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 8fe200b..188d45f 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -40,7 +40,7 @@ def firefox_releases
     end
 
     threads << Thread.new do
-        `rmadison -u ubuntu -a amd64 firefox`.to_str.each_line { |line|
+        `rmadison -u ubuntu -a amd64 -s #{RELEASE} firefox`.to_str.each_line { |line|
             match_data = line.match('(\d+[.]\d+)')
             ubuntu_versions <<  match_data[0].to_f unless match_data.nil?
         }
@@ -80,10 +80,10 @@ def build_firefox
     `rm -rf build`
     Dir.mkdir('build')
     Dir.chdir('build') {
-        fail "Can't download firefox!" unless system("pull-lp-source firefox #{`lsb_release -cs`.strip}")
+        fail "Can't download firefox!" unless system("pull-lp-source firefox #{RELEASE}")
         firefox_dir = Dir["firefox-*"][0]
 
-        system("hg clone http://www.rosenauer.org/hg/mozilla/#firefox#{release_info[:upstream].to_i} suse")
+        system("hg clone http://www.rosenauer.org/hg/mozilla/#firefox#{release_info[:ubuntu].to_i} suse")
         Dir.chdir(firefox_dir) {
             changelog = Changelog.new
             version = "1000~#{changelog.version(Changelog::BASE)}"

-- 
ci-tooling packaging