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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit dcd19471acb2fe44ed4942e962b73682fb830781
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Jan 7 19:08:21 2015 +0100

    Install nokogiri before requiring it at runtime
---
 dci/mozilla.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 4a4a108..960ad3c 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -2,9 +2,7 @@ require_relative '../lib/logger'
 require_relative '../lib/debian/changelog'
 require_relative '../lib/debian/control'
 
-
 require 'open-uri'
-require 'nokogiri'
 require 'thwait'
 
 fail 'Need a mozilla product to build for!' unless ARGV[1]
@@ -16,6 +14,7 @@ PACKAGE = ARGV[1]
 RELEASE = ARGV[2]
 
 def firefox_releases
+    require 'nokogiri'
     threads = []
     ubuntu_versions = []
     upstream_versions = []
@@ -128,4 +127,6 @@ def build_thunderbird
 end
 
 run_cmd('apt-get update')
-run_cmd('apt-get -y install ubuntu-dev-tools mercurial')
+run_cmd('apt-get -y install ubuntu-dev-tools mercurial ruby-nokogiri')
+
+build_firefox

-- 
ci-tooling packaging