[SCM] ci-tooling packaging branch, master, updated. 9b7ff1282e8be2cecc8ffbad20ce85d84e225009

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 9b7ff1282e8be2cecc8ffbad20ce85d84e225009
Author: Rohan Garg <rohan at garg.io>
Date:   Fri Nov 27 20:14:38 2015 +0100

    define ec before begin
---
 ci/imager.rb | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/ci/imager.rb b/ci/imager.rb
index e03334a..f43ad41 100755
--- a/ci/imager.rb
+++ b/ci/imager.rb
@@ -8,6 +8,8 @@ fail "No live-config found!" unless File.exist?('live-config')
 Apt.update
 Apt.install(%w(live-build live-images qemu-user-static))
 
+ec = 0
+
 begin
   FileUtils.mkdir_p 'result'
   Dir.chdir('live-config') do
@@ -21,19 +23,20 @@ ensure
   Dir.chdir('live-config') do
     system('make clean')
   end
-  # Workaround for docker not having suidmaps. We run as root in the docker
-  # which will result in uid/gid of written things to be 0 rather than whatever
-  # jenkins has. So instead we have a fake jenkins user in the docker we can
-  # chmod to. This ultimately ensures that the owernship is using the uid of
-  # the host jenkins (equal to docker jenkins) such that we don't end up with
-  # stuff owned by others.
-  at_exit do
-    FileUtils.chown_R('jenkins', 'jenkins', Dir.pwd, verbose: true)
-  end
+end
 
-  Signal.trap 'TERM' do
-    FileUtils.chown_R('jenkins', 'jenkins', Dir.pwd, verbose: true)
-  end
+# Workaround for docker not having suidmaps. We run as root in the docker
+# which will result in uid/gid of written things to be 0 rather than whatever
+# jenkins has. So instead we have a fake jenkins user in the docker we can
+# chmod to. This ultimately ensures that the owernship is using the uid of
+# the host jenkins (equal to docker jenkins) such that we don't end up with
+# stuff owned by others.
+at_exit do
+  FileUtils.chown_R('jenkins', 'jenkins', Dir.pwd, verbose: true)
+end
+
+Signal.trap 'TERM' do
+  FileUtils.chown_R('jenkins', 'jenkins', Dir.pwd, verbose: true)
 end
 
 exit ec

-- 
ci-tooling packaging