projects
/
grml-debootstrap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
672ff48
)
Return always true in gpg code
author
Michael Prokop
<mika@grml.org>
Sun, 22 Apr 2007 22:30:56 +0000
(
00:30
+0200)
committer
Michael Prokop
<mika@grml.org>
Sun, 22 Apr 2007 22:30:56 +0000
(
00:30
+0200)
chroot-script
patch
|
blob
|
history
diff --git
a/chroot-script
b/chroot-script
index
6f128c1
..
756d6a5
100644
(file)
--- 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.
# 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:3
3 CEST 2007 [mika]
+# Latest change: Mon Apr 23 00:
30:4
3 CEST 2007 [mika]
################################################################################
set -e # exit on any error
################################################################################
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 "$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
}
return 1
fi
}
@@
-65,6
+65,10
@@
grmlrepos() {
deb-src http://deb.grml.org/ grml-testing main
EOF
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
}
# }}}
fi
}
# }}}