[SCM] ci-tooling packaging branch, master, updated. 925e9e27c7f8ac445f29c706c37578957725eeae

[Harald Sitter]

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

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

    move install wamerican to bottom of setup chain
    
    so we don't accidentially trigger something that is workedaround or
    disabled in one of the other steps
---
 kci/install_check.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kci/install_check.rb b/kci/install_check.rb
index b6b1155..385d2fe 100755
--- a/kci/install_check.rb
+++ b/kci/install_check.rb
@@ -185,12 +185,6 @@ end
 File.write('/usr/sbin/invoke-rc.d', "#!/bin/sh
")
 # Speed up dpkg
 File.write('/etc/dpkg/dpkg.cfg.d/02apt-speedup', "force-unsafe-io
")
-# 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
-# anything, intead it just craps out if a wordlist provider is installed but
-# there is no wordlist -.-
-system('apt-get install wamerican')
 # Prevent xapian from slowing down the test.
 # Install a fake package to prevent it from installing and doing anything.
 # This does render it non-functional but since we do not require the database
@@ -224,6 +218,12 @@ 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')
+# 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
+# anything, intead it just craps out if a wordlist provider is installed but
+# there is no wordlist -.-
+system('apt-get install wamerican')
 
 daily_ppa = CiPPA.new("#{project.stability}-daily", project.series)
 live_ppa = CiPPA.new("#{project.stability}", project.series)

-- 
ci-tooling packaging