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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 7d3cede23eb0ecc730f4fd8c5652762d0a50edf7
Author: Rohan Garg <rohan at kde.org>
Date:   Thu Feb 19 17:01:29 2015 +0100

    Make sure result_dir is a constant
---
 dci/build.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dci/build.rb b/dci/build.rb
index 2bbf909..86892e8 100644
--- a/dci/build.rb
+++ b/dci/build.rb
@@ -24,6 +24,8 @@ OptionParser.new do | opts |
     end
 end.parse!
 
+RESULT_DIR = '/build/'
+
 logger = DCILogger.instance
 
 dpkg_buildopts = %w(-us -uc -sa)
@@ -37,8 +39,6 @@ else
     package_version = `grep Version #{ARGV[1]}`.split(':')[-1].strip
     package_release = `grep Distribution #{ARGV[1]}`.split(':')[-1].strip
 
-    result_dir = '/build/'
-
     logger.info("Starting build for #{package_name}")
     logger.info("Adding custom repos #{options[:repos]}")
     # Skip if there is only one repo in the options, since thats the 'default' config
@@ -93,7 +93,7 @@ else
               system("dh_install --fail-missing")
               logger.error("Not all files have been installed!") unless $?.success?
           }
-          FileUtils.mkdir_p(result_dir) unless Dir.exist? result_dir
+          FileUtils.mkdir_p(RESULT_DIR) unless Dir.exist? RESULT_DIR
           changes_files = Dir.glob("*changes").select { |changes| !changes.include? 'source' }
           changes_files.each do |changes_file|
               logger.info("Copying #{changes_file} ...")
@@ -111,8 +111,8 @@ else
                   system("lesspipe #{deb}")
               }
 
-              system("dcmd mv #{changes_file} #{result_dir}")
-              system("chmod 2770 #{result_dir}") unless File.stat(result_dir).setgid?
+              system("dcmd mv #{changes_file} #{RESULT_DIR}")
+              system("chmod 2770 #{RESULT_DIR}") unless File.stat(RESULT_DIR).setgid?
           end
           logger.info("Build finished!")
         }

-- 
ci-tooling packaging