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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 6980c29ad5d855bafe6102f68221cbf8a4515b3d
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Dec 7 12:54:53 2015 +0100

    make logger an instance var, it doesn't actually need to be global here
    
    global would only be necessary with a same or higher level scope change,
    everything in mozilla.rb happens within the same scope or subscopes though
    (def)
---
 dci/mozilla.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index e5a8800..57db359 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -10,11 +10,11 @@ require 'date'
 fail 'Need a mozilla product to build for!' unless ARGV[1]
 fail 'Need a release to build for!' unless ARGV[2]
 
-$logger = DCILogger.instance
+ at logger = DCILogger.instance
 
 PACKAGE = ARGV[1]
 
-$logger.info("Building #{PACKAGE}")
+ at logger.info("Building #{PACKAGE}")
 
 def package_releases
   require 'nokogiri'
@@ -40,7 +40,7 @@ def package_releases
 
     upstream_versions.uniq!
     upstream_versions.sort!
-    $logger.info("Upstream #{upstream_versions}")
+    @logger.info("Upstream #{upstream_versions}")
   end
 
   threads << Thread.new do
@@ -59,7 +59,7 @@ def package_releases
 
     ubuntu_versions.uniq!
     ubuntu_versions.sort!
-    $logger.info("Ubuntu #{ubuntu_versions}")
+    @logger.info("Ubuntu #{ubuntu_versions}")
   end
 
   ThreadsWait.all_waits(threads)
@@ -81,7 +81,7 @@ def bump_version
     version += '-0ubuntu1'
   end
   version += "~#{DateTime.now.strftime('%Y%m%d.%H%M')}"
-  $logger.info("New version is going to be #{version}")
+  @logger.info("New version is going to be #{version}")
   `dch -v "#{version}" "[CI Build] #{PACKAGE} with KDE integration"`
 
   new_changelog = Changelog.new
@@ -92,7 +92,7 @@ def bump_version
 end
 
 def install_kde_js
-  $logger.info('Modifying debian/rules')
+  @logger.info('Modifying debian/rules')
   rules = File.read('debian/rules')
   rules.gsub!(/pre-build.*$/) do |m|
     m += "
	mkdir -p $(MOZ_DISTDIR)/bin/defaults/pref/
	cp $(CURDIR)/debian/kde.js $(MOZ_DISTDIR)/bin/defaults/pref/kde.js"
@@ -146,7 +146,7 @@ def build_firefox(release_info)
     # the KDE patches
     system('quilt delete unity-menubar.patch')
 
-    $logger.info('Adding Firefox KDE patches')
+    @logger.info('Adding Firefox KDE patches')
     File.open('debian/patches/series', 'a') do |f|
       # Please preserve this order of patch
       f.puts("mozilla-kde.patch
firefox-kde.patch
unity-menubar.patch
")
@@ -213,7 +213,7 @@ RELEASE = (DEBIAN_RELEASES.include? ARGV[2]) ? UBUNTU_RELEASES[-2] : ARGV[2]
 
 release_info = package_releases
 if release_info[:ubuntu] < release_info[:upstream]
-  $logger.warn("Building #{PACKAGE} while Ubuntu hasn't updated the package!")
+  @logger.warn("Building #{PACKAGE} while Ubuntu hasn't updated the package!")
 end
 
 `rm -rf build`

-- 
ci-tooling packaging