From 4338eae99d4494ba86b398a22247a6bae92f81b7 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 18 Apr 2014 00:19:52 +0200
Subject: chroot-run.sh: unconditionally install 'build-essential devscripts
 git' and prepare apt to assume 'yes'

---
 bin/chroot-run.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/chroot-run.sh b/bin/chroot-run.sh
index ac84614c..d4f6decd 100755
--- a/bin/chroot-run.sh
+++ b/bin/chroot-run.sh
@@ -93,12 +93,11 @@ run() {
 	cat > $CHROOT_TARGET/tmp/chroot-testrun <<-EOF
 $SCRIPT_HEADER
 cd /tmp/testrun
-apt-get -y install git
+echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/23jenkins
+apt-get install build-essential devscripts git
 if [ -f debian/control ] ; then
 	cat debian/control
 	# install build-depends
-	echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/23jenkins
-	apt-get install build-essential devscripts
 	mk-build-deps -ir
 fi
 $@
-- 
cgit v1.2.3-54-g00ecf