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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit bcfc9cba4c24e28bf71c25d5462ff2f2cba70abb
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Dec 17 22:32:32 2014 +0100

    Use fancy new logger
---
 dci/autopkgtest.rb | 4 +++-
 dci/build.rb       | 4 ++--
 dci/source.rb      | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dci/autopkgtest.rb b/dci/autopkgtest.rb
index a95144c..33cdd6b 100644
--- a/dci/autopkgtest.rb
+++ b/dci/autopkgtest.rb
@@ -8,4 +8,6 @@ else
     logger.info("Starting autopkgtest")
     autopkgtest_result = system("DEB_BUILD_OPTIONS=\"parallel=$(nproc)\" adt-run --changes #{ARGV[1]} --- null")
     autopkgtest_result ? logger.info("Autopkg test passed!") : logger.error("Autopkg test failed!")
-end
\ No newline at end of file
+end
+
+logger.close
diff --git a/dci/build.rb b/dci/build.rb
index 3f9a9d8..f950221 100644
--- a/dci/build.rb
+++ b/dci/build.rb
@@ -1,9 +1,9 @@
-require 'logger'
 require 'tmpdir'
 require 'fileutils'
 require 'optparse'
 require 'json'
 require_relative '../lib/debian/control'
+require_relative '../lib/logger'
 
 ## Some notes :
 ##      * All builds happen in /tmp/<tmp dir>
@@ -23,7 +23,7 @@ OptionParser.new do | opts |
     end
 end.parse!
 
-logger = Logger.new(STDOUT)
+logger = new_logger
 
 if not ARGV[1].end_with? '.changes'
     logger.fatal("#{ARGV[1]} is not an actual changes file. Abort!")
diff --git a/dci/source.rb b/dci/source.rb
index 88e6d72..32573b4 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -5,8 +5,7 @@ require 'optparse'
 require 'json'
 require_relative '../lib/debian/changelog'
 require_relative '../lib/debian/control'
-
-p ARGV
+require_relative '../lib/logger'
 raise "No workspace dir defined!" unless ARGV[1]
 raise "No release defined!" unless ARGV[2]
 
@@ -22,7 +21,7 @@ OptionParser.new do | opts |
     end
 end.parse!
 
-$logger = Logger.new(STDOUT)
+$logger = new_logger
 release = ARGV[2]
 
 def run_cmd(cmd)
@@ -142,3 +141,5 @@ Dir.chdir(ARGV[1]) do
     system("dcmd chmod 666 /build/#{source_name}*_source.changes")
     system('chmod 2770 /build') unless File.stat('/build').setgid?
 end
+
+logger.close

-- 
ci-tooling packaging