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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 3a47e76299b6b2fbcebb900f71b9f9bf4a094811
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Dec 10 02:33:30 2014 +0100

    Random note of the day, file permissions have nothing to do with mv
    
    Apparently programs should have write permissions for the directories
    containing the source and destination, so fix permissions for the dir
    before exiting.
---
 dci/build.rb  | 3 ++-
 dci/source.rb | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dci/build.rb b/dci/build.rb
index b25b661..437f8d1 100644
--- a/dci/build.rb
+++ b/dci/build.rb
@@ -17,7 +17,7 @@ else
     package_name = `grep Source #{ARGV[1]}`.split(':')[-1].strip
     package_version = `grep Version #{ARGV[1]}`.split(':')[-1].strip
 
-    result_dir = "/build/binary/"
+    result_dir = '/build/binary/'
 
     logger.info("Cleaning up before build")
 
@@ -59,6 +59,7 @@ else
               logger.info("Copying #{changes_file} ...")
               system("dcmd chmod 666 #{changes_file}")
               system("dcmd mv #{changes_file} #{result_dir}")
+              system("chmod 2770 #{result_dir}") unless File.stat(result_dir).setgid?
           end
           logger.info("Build finished!")
         }
diff --git a/dci/source.rb b/dci/source.rb
index 52b7b12..9c613c6 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -84,4 +84,5 @@ Dir.chdir(ARGV[1]) do
 
     system("dcmd mv #{source_name}*_source.changes /build/")
     system("dcmd chmod 666 /build/#{source_name}*_source.changes")
+    system('chmod 2770 /build') unless File.stat('/build').setgid?
 end

-- 
ci-tooling packaging