aboutsummaryrefslogtreecommitdiff
path: root/trunk/src/mkbuild
diff options
context:
space:
mode:
Diffstat (limited to 'trunk/src/mkbuild')
-rwxr-xr-xtrunk/src/mkbuild29
1 files changed, 1 insertions, 28 deletions
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index 6ca1259..0f786e1 100755
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -1540,34 +1540,7 @@ function mkbuild_update_keyring {
# Update keyring using GPG-KEY from
# mkbuild repository
- local keyring keys key
-
- keyring="$MKBUILDS_DIR/GPG-KEY"
-
- if [ ! -e "$keyring" ]; then
- repo_gpg_key $MKBUILDS_DIR
- return
- fi
-
- keys="`gpg --with-colons $MKBUILDS_DIR/GPG-KEY | cut -d : -f 5 | sed -e '/^$/d'`"
-
- for key in $keys; do
- if [ ! -z "$SIGN_USER" ] && [ "`whoami`" != "$SIGN_USER" ]; then
- su $SIGN_USER -c "gpg --list-keys $key &> /dev/null"
- if [ "$?" != "0" ]; then
- echo "Updating keyring using $keyring..."
- su $SIGN_USER -c "gpg --import $keyring"
- break
- fi
- else
- gpg --list-keys $key &> /dev/null
- if [ "$?" != "0" ]; then
- echo "Updating keyring using $keyring..."
- gpg --import $keyring
- break
- fi
- fi
- done
+ update_keyring $MKBUILDS_DIR/GPG-KEY
}