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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 0e20cc410c3ab1bf17c5cd8a10565addaf7a2cab
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Mar 25 18:31:56 2015 +0100

    Move files *after* their sums have been calculated
---
 dci/imager.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index 32a85a0..c3ca5e2 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -132,6 +132,7 @@ Dir.chdir('build') do
   fail 'Oops! Something went wrong, see the log' unless $?.success?
 
   files = Dir.glob('live-image*')
+  new_files = []
 
   time = DateTime.now.strftime('%Y%m%d%H%M')
   FileUtils.mkdir_p("/build/#{FLAVOR}")
@@ -142,7 +143,7 @@ Dir.chdir('build') do
     new_name = f.gsub("live-image-#{arch}",
                       "netrunner-debian-#{arch}-#{time}")
     File.rename(f, new_name)
-    FileUtils.mv(new_name, "/build/#{FLAVOR}/")
+    new_files << new_name
   end
 
   md5sum = `md5sum *.iso`
@@ -152,4 +153,5 @@ Dir.chdir('build') do
   File.write('SHA256SUM', sha256sum)
 
   File.mv(%w(SHA256SUM, MD5SUM), "/build/#{FLAVOR}")
+  File.mv(new_files, "/build/#{FLAVOR}")
 end

-- 
ci-tooling packaging