[SCM] ci-tooling packaging branch, master, updated. 5d9525b7f64403391990ea78fd5c8dd5035bd694

Harald Sitter apachelogger-guest at moszumanska.debian.org
Sat May 2 19:40:15 UTC 2015


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

The following commit has been merged in the master branch:
commit 5d9525b7f64403391990ea78fd5c8dd5035bd694
Author: Harald Sitter <sitter at kde.org>
Date:   Sat May 2 21:40:11 2015 +0200

    abort when shit happens
---
 kci/install_check.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kci/install_check.rb b/kci/install_check.rb
index 768d0c9..f8c1d1d 100755
--- a/kci/install_check.rb
+++ b/kci/install_check.rb
@@ -222,11 +222,11 @@ Open3.popen3('debconf-set-selections') do |stdin, _stdout, stderr, wait_thr|
   puts stderr.read
 end
 # Make sure everything is up-to-date.
-Apt.update
-Apt.dist_upgrade
+abort 'failed to update' unless Apt.update
+abort 'failed to dist upgrade' unless Apt.dist_upgrade
 # Install ubuntu-minmal first to make sure foundations nonsense isn't going
 # to make the test fail half way through.
-Apt.install('ubuntu-minimal')
+abort 'failed to install minimal' unless Apt.install('ubuntu-minimal')
 # Because dependencies are fucked
 # [14:27] <sitter> dictionaries-common is a crap package
 # [14:27] <sitter> it suggests a wordlist but doesn't pre-depend them or

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list