[SCM] ci-tooling packaging branch, master, updated. 7990f25c7ad8ccdcb0406cb896c8de2e5abc6284

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 7990f25c7ad8ccdcb0406cb896c8de2e5abc6284
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Apr 22 18:39:41 2015 +0200

    Add support to download debs from URL's
---
 dci/imager.rb | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index cca2ca9..16c8c33 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -83,6 +83,11 @@ def workarounds
   end
 end
 
+def deb_from_url(url)
+  fail 'Make sure to run lb config first!' unless Dir.exist? 'config/packages.chroot/'
+  system("wget -P config/packages.chroot/ #{url}")
+end
+
 logger = DCILogger.instance
 
 Dir.mkdir('build') unless Dir.exist? 'build'
@@ -97,14 +102,16 @@ Dir.chdir('build') do
 
   extra_opts = []
   packages = []
+  packages_from_url = []
   repos = []
 
   case FLAVOR
   when /.*netrunner.*desktop/
-    repos = %w(qt5 frameworks plasma netrunner calamares moz-plasma extras)
+    repos = %w(qt5 frameworks plasma netrunner calamares moz-plasma extras steam)
     # live build is a bit shit at handling multi arch at the moment
     # So we need to explicitly specify that we need skype-bin:i386 on the ISO
     packages = %w(netrunner-desktop calamares calamares-branding skype-bin:i386)
+    packages_from_url = %w(http://media.steampowered.com/client/installer/steam.deb)
 
     extra_opts << '--debian-installer-gui false'
 
@@ -155,10 +162,14 @@ Dir.chdir('build') do
                package + "
", mode: 'a')
   end
 
+  packages_from_url.each do |package|
+    deb_from_url(package)
+  end
   File.delete('config/archives/dci.list') if File.exist? 'config/archives/dci.list'
   repos.each do |repo|
     logger.info("Adding #{repo} to ISO")
-    File.write('config/archives/dci.list', "deb http://pangea-data.s3.amazonaws.com/dci/#{repo}/debian #{RELEASE} main" + "
", mode: 'a')
+    File.write('config/archives/dci.list',
+               "deb http://pangea-data.s3.amazonaws.com/dci/#{repo}/debian #{RELEASE} main" + "
", mode: 'a')
   end
 
   File.write('config/archives/dci.key', REPO_KEY)

-- 
ci-tooling packaging