[SCM] ci-tooling packaging branch, master, updated. 8640b20cca3e7baf27fe2a45b640e50c11ea0ae9

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 8640b20cca3e7baf27fe2a45b640e50c11ea0ae9
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Mar 25 16:14:19 2015 +0100

    Figure out arch using dpkg-architechture
---
 dci/imager.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index f80e061..341cef4 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -8,7 +8,6 @@ pp ENV.to_h
 
 fail 'Need a release to build for!' unless ARGV[1]
 fail 'Need a flavor to  build!' unless ARGV[2]
-fail 'No arch to build for!' unless ENV['arch']
 
 RELEASE = ARGV[1]
 FLAVOR = ARGV[2]
@@ -137,9 +136,11 @@ Dir.chdir('build') do
   time = DateTime.now.strftime('%Y%m%d%H%M')
   FileUtils.mkdir_p("/build/#{FLAVOR}")
 
+  arch = `dpkg-architecture -qDEB_BUILD_ARCH`
+
   files.each do |f|
-    new_name = f.gsub("live-image-#{ENV['arch']}",
-                      "netrunner-debian-#{ENV['arch']}-#{time}")
+    new_name = f.gsub("live-image-#{arch}",
+                      "netrunner-debian-#{arch}-#{time}")
     File.rename(f, new_name)
     FileUtils.mv(new_name, "/build/#{FLAVOR}/")
   end

-- 
ci-tooling packaging