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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 1f214f78718fbdf49112ed73d90b17c6b9b6cb6c
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Oct 5 14:37:34 2015 +0200

    reduce scope of consts and env mangling
    
    - move env mangling into run and remove now deprecated mangling.
      containment makes sure home, path etc are in order
    - adjust stdout only in run
    - move dputconf and keyid into class scope
    - move project struct into class scope
    
    this is to prevent polluting the global name space
---
 kci/builder.rb | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index 7910d76..b80af93 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -37,19 +37,13 @@ require_relative 'lib/lint/symbols'
 -> update_symbols
 =end
 
-ENV['HOME'] = '/var/lib/jenkins'
-ENV['PATH'] = '/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin'
-ENV['GNUPGHOME'] = '/var/lib/jenkins/tooling/gnupg'
-DPUTCONF = '/var/lib/jenkins/tooling/dput.cf'
-KEYID = '6A0C5BF2'
-
-Project = Struct.new(:series, :stability, :name)
-
-$stdout = $stderr
-
 class KCIBuilder
   class CoverageError < Exception; end
 
+  DPUTCONF = '/var/lib/jenkins/tooling/dput.cf'
+  KEYID = '6A0C5BF2'
+  Project = Struct.new(:series, :stability, :name)
+
   def self.testing=(testing)
     @testing = testing
   end
@@ -59,6 +53,10 @@ class KCIBuilder
   end
 
   def self.run
+    ENV['GNUPGHOME'] = '/var/lib/jenkins/tooling/gnupg'
+
+    $stdout = $stderr
+
     # get basename, distro series, unstable/stable
     components = ARGV.fetch(0).split('_')
     unless components.size == 3

-- 
ci-tooling packaging