[SCM] ci-tooling packaging branch, master, updated. 2b969018e8c48083fb2a873f854bbeac4328d9b4

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 2b969018e8c48083fb2a873f854bbeac4328d9b4
Author: Harald Sitter <sitter at kde.org>
Date:   Sat May 2 19:34:04 2015 +0200

    make sure the container is uptodate and has ubuntu-minimal
    
    this is to prevent failure and if there are foundation problems to fail
    early rather than late
---
 kci/install_check.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kci/install_check.rb b/kci/install_check.rb
index f0d67a1..b6b1155 100755
--- a/kci/install_check.rb
+++ b/kci/install_check.rb
@@ -6,6 +6,7 @@ require 'logger/colors'
 require 'open3'
 require 'tmpdir'
 
+require_relative 'lib/apt'
 require_relative 'lib/dpkg'
 require_relative 'lib/lp'
 require_relative 'lib/retry'
@@ -218,6 +219,11 @@ Open3.popen3('debconf-set-selections') do |stdin, _stdout, stderr, wait_thr|
   wait_thr.join
   puts stderr.read
 end
+# Make sure everything is up-to-date.
+Apt.update
+# Install ubuntu-minmal first to make sure foundations nonsense isn't going
+# to make the test fail half way through.
+Apt.install('ubuntu-minimal')
 
 daily_ppa = CiPPA.new("#{project.stability}-daily", project.series)
 live_ppa = CiPPA.new("#{project.stability}", project.series)

-- 
ci-tooling packaging