From: Michael Prokop <mika@grml.org>
Date: Sun, 22 Apr 2007 22:30:56 +0000 (+0200)
Subject: Return always true in gpg code
X-Git-Tag: 0.9~14
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=72cddf610a02e28d191370c56b23556b1aafc127;ds=sidebyside

Return always true in gpg code
---

diff --git a/chroot-script b/chroot-script
index 6f128c1..756d6a5 100644
--- a/chroot-script
+++ b/chroot-script
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Apr 23 00:22:33 CEST 2007 [mika]
+# Latest change: Mon Apr 23 00:30:43 CEST 2007 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -37,7 +37,7 @@ stage() {
      echo "$2" > "$STAGES/$1"
      return 0
   elif grep -q done "$STAGES/$1" 2>/dev/null ; then
-     echo "Notice: stage $1 has been executed already, skipping execution therefore.">&2
+     echo "[*] Notice: stage $1 has been executed already, skipping execution therefore.">&2
      return 1
   fi
 }
@@ -65,6 +65,10 @@ grmlrepos() {
   deb-src http://deb.grml.org/ grml-testing main
 
 EOF
+     # make sure we have the keys available for aptitude
+     gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 && \
+     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]
   fi
 }
 # }}}