[SCM] ci-tooling packaging branch, master, updated. 10e589528f4ff5ff8ccf9b95d913f128394f2ce0

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit e04f0c510cc54d6acd78d2555cb70d5b49047f1b
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Apr 30 12:21:50 2015 +0200

    try to prevent xapian from IO blocking install tests
---
 kci/install_check.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kci/install_check.rb b/kci/install_check.rb
index 4bcad24..81f79be 100755
--- a/kci/install_check.rb
+++ b/kci/install_check.rb
@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'fileutils'
 require 'logger'
 require 'logger/colors'
 
@@ -186,6 +187,12 @@ File.write('/etc/dpkg/dpkg.cfg.d/02apt-speedup', "force-unsafe-io
")
 # 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 running its postinst cache generation.
+# The postinst only triggers a full indexing iff there is no directory yet.
+# The only other two options for a cache build to trigger are actually trying
+# to use the cache (which ought not happen as part of the test) or through the
+# cron (which also ought not happen as there is no crond).
+FileUtils.mkpath('/var/lib/apt-xapian-index')
 
 daily_ppa = CiPPA.new("#{project.stability}-daily", project.series)
 live_ppa = CiPPA.new("#{project.stability}", project.series)

-- 
ci-tooling packaging