[SCM] ci-tooling packaging branch, master, updated. 1b76e3bbd5e4bf3b921317b088ba61d4cf21f5da

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 1b76e3bbd5e4bf3b921317b088ba61d4cf21f5da
Author: Harald Sitter <sitter at kde.org>
Date:   Sat May 2 21:36:03 2015 +0200

    install fake resolvconf package because everything must be shit
    
    I can't ever have nice things.
---
 kci/install_check.rb | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/kci/install_check.rb b/kci/install_check.rb
index 75bf08b..768d0c9 100755
--- a/kci/install_check.rb
+++ b/kci/install_check.rb
@@ -179,6 +179,24 @@ class CiPPA
   end
 end
 
+def install_fake_pkg(name)
+  Dir.mktmpdir do |tmpdir|
+    Dir.chdir(tmpdir) do
+      Dir.mkdir(name)
+      Dir.mkdir("#{name}/DEBIAN")
+      File.write("#{name}/DEBIAN/control", <<-EOF.gsub(/^\s+/, ''))
+      Package: #{name}
+      Version: 999:999
+      Architecture: all
+      Maintainer: Harald Sitter <sitter at kde.org>
+      Description: fake override package for kubuntu ci install checks
+      EOF
+      system("dpkg-deb -b #{name} #{name}.deb")
+      DPKG.dpkg(['-i', "#{name}.deb"])
+    end
+  end
+end
+
 # Disable invoke-rc.d because it is crap and causes useless failure on install
 # when it fails to detect upstart/systemd running and tries to invoke a sysv
 # script that does not exist.
@@ -191,23 +209,11 @@ File.write('/etc/dpkg/dpkg.cfg.d/02apt-speedup', "force-unsafe-io
")
 # anyway this is the apparently only way we can make sure that it doesn't
 # create its stupid database. The CI hosts have really bad IO performance making
 # a full index take more than half an hour.
-Dir.mktmpdir do |tmpdir|
-  Dir.chdir(tmpdir) do
-    Dir.mkdir('apt-xapian-index')
-    Dir.mkdir('apt-xapian-index/DEBIAN')
-    File.write('apt-xapian-index/DEBIAN/control', <<-EOF.gsub(/^\s+/, ''))
-    Package: apt-xapian-index
-    Version: 999:999
-    Architecture: all
-    Maintainer: Harald Sitter <sitter at kde.org>
-    Description: fake override package for kubuntu ci install checks
-    EOF
-    system('dpkg-deb -b apt-xapian-index xapian.deb')
-    DPKG.dpkg(['-i', 'xapian.deb'])
-  end
-  # Muon postinst would explicitly update.
-  File.write('/usr/sbin/update-apt-xapian-index', "#!/bin/sh
")
-end
+install_fake_pkg('apt-xapian-index')
+File.write('/usr/sbin/update-apt-xapian-index', "#!/bin/sh
")
+# Also install a fake resolvconf because docker is a piece of shit cunt
+# https://github.com/docker/docker/issues/1297
+install_fake_pkg('resolvconf')
 # Disable manpage database updates
 Open3.popen3('debconf-set-selections') do |stdin, _stdout, stderr, wait_thr|
   stdin.puts('man-db man-db/auto-update boolean false')

-- 
ci-tooling packaging