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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 636d0e8ac9b99778b410b4c49c0191101e0ecff8
Author: Rohan Garg <rohan at garg.io>
Date:   Fri Apr 10 02:21:05 2015 +0200

    Make sure we chown first and move the files that we know exist
---
 dci/imager.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index 04851fe..41acee7 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -186,17 +186,18 @@ Dir.chdir('build') do
     new_files << new_name
   end
 
+  FileUtils.chown_R('jenkins-slave',
+                    'jenkins-slave',
+                    "/build/#{FLAVOR}",
+                    verbose: true)
+
   if Dir.glob('*.iso').size > 0
     md5sum = `md5sum *.iso`
     File.write('MD5SUM', md5sum)
     sha256sum = `sha256sum *.iso`
     File.write('SHA256SUM', sha256sum)
+    FileUtils.mv(%w(SHA256SUM MD5SUM), "/build/#{FLAVOR}")
   end
 
-  FileUtils.chown_R('jenkins-slave',
-                    'jenkins-slave',
-                    "/build/#{FLAVOR}",
-                    verbose: true)
-  FileUtils.mv(%w(SHA256SUM MD5SUM), "/build/#{FLAVOR}")
   FileUtils.mv(new_files, "/build/#{FLAVOR}")
 end

-- 
ci-tooling packaging