[DHG_packages] 10/10: Unconditionally install dctrl-tools in the fixup script

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository DHG_packages.

commit 6d95138b1295153525ef696d06ca9b75ba14004a
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Aug 11 11:29:19 2015 +0200

    Unconditionally install dctrl-tools in the fixup script
---
 make-all.hs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/make-all.hs b/make-all.hs
index 3922d37..21f6400 100644
--- a/make-all.hs
+++ b/make-all.hs
@@ -151,6 +151,9 @@ parseFlatRel = flatRels . parseRels
 fixupScript :: [String] -> String
 fixupScript pkgs = unlines $
     [ "#!/bin/bash"
+    -- I disable locking in the schroot. I have /var/cache/apt/archives bind-mounted
+    -- via /etc/schroot/default/fstab, so with locking, I could not run
+    -- multiple sbuilds at the same time
     , "echo 'Debug::NoLocking \"true\";' > /etc/apt/apt.conf.d/no-locking"
     ] ++ ignoreArchiveDepends pkgs
 
@@ -158,6 +161,7 @@ ignoreArchiveDepends :: [String] -> [String]
 ignoreArchiveDepends [] = []
 ignoreArchiveDepends pkgs =
     [ "#!/bin/bash"
+    , "apt-get install dctrl-tools" -- Just in case it is not installed in the base schroot
     , "for f in /var/lib/apt/lists/*_Packages"
     , "do"
     , "grep-dctrl -v -F Package -X " ++ disj ++ " < \"$f\" > \"$f\".tmp"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git