From 4fdbdbc3bccf62350c5fee4683ab9e701ca001f1 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 23 Apr 2007 12:02:10 +0200 Subject: [PATCH] Fix syntax error in chroot-script --- chroot-script | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/chroot-script b/chroot-script index 4807303..bc93353 100644 --- a/chroot-script +++ b/chroot-script @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Mon Apr 23 11:51:59 CEST 2007 [mika] +# Latest change: Mon Apr 23 12:02:03 CEST 2007 [mika] ################################################################################ set -e # exit on any error @@ -70,8 +70,10 @@ EOF gpg --export F61E2E7CECDEA787 | apt-key add - || /bin/true # not yet sure # why it's necessary, sometimes we get an error even though it works [mika] - if grep -q grml /etc/apt/preferences 2>/dev/null ; then - cat >> /etc/apt/preferences >> EOF + # make sure we install packages from grml's pool only if not available + # from Debian! + if ! grep -q grml /etc/apt/preferences 2>/dev/null ; then + cat >> /etc/apt/preferences << EOF // debian pool (default): Package: * Pin: release o=Debian @@ -82,6 +84,7 @@ Package: * Pin: origin deb.grml.org Pin-Priority: 991 EOF + fi fi } # }}} -- 2.1.4