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

Rohan Garg rohangarg-guest at moszumanska.debian.org
Tue Jan 27 13:41:20 UTC 2015


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

The following commit has been merged in the master branch:
commit abd1688cdb6324ad7c6590c0166118254f12622c
Author: Rohan Garg <rohan at kde.org>
Date:   Tue Jan 27 14:41:11 2015 +0100

    Pass the release info to the methods
---
 dci/mozilla.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index e42b787..d7b6e7e 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -119,7 +119,7 @@ def add_dummy_package
   end
 end
 
-def build_firefox
+def build_firefox(release_info)
   system("hg clone http://www.rosenauer.org/hg/mozilla/#firefox#{release_info[:ubuntu].to_i} suse")
 
   firefox_dir = Dir["firefox-*"][0]
@@ -146,7 +146,7 @@ def build_firefox
   end
 end
 
-def build_thunderbird
+def build_thunderbird(release_info)
   thunderbird_dir = Dir["thunderbird-*"][0]
   Dir.chdir(thunderbird_dir) do
     bump_version
@@ -194,8 +194,8 @@ Dir.mkdir('build')
 Dir.chdir('build') do
   dci_run_cmd("pull-lp-source -m http://127.0.0.1:3142/ubuntu #{PACKAGE} #{RELEASE}")
 
-  build_firefox if PACKAGE == 'firefox'
-  build_thunderbird if PACKAGE == 'thunderbird'
+  build_firefox(release_info) if PACKAGE == 'firefox'
+  build_thunderbird(release_info) if PACKAGE == 'thunderbird'
 
   system('debian/rules debian/control')
   `dch --release --distribution #{RELEASE} ""`

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list