From 9bdbd82aa16d3ff0b4cd2828adde49a73c3f1c9b Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Thu, 22 Jan 2009 01:55:26 +0000
Subject: more changes towards #41 completion

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@766 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/src/createpkg |  3 +++
 trunk/src/mkbuild   | 29 +----------------------------
 2 files changed, 4 insertions(+), 28 deletions(-)

(limited to 'trunk/src')

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 705b10b..bbb0a4b 100644
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -657,6 +657,9 @@ esac
 # Synchronize repository
 [ $SYNC -eq $yes ] && sync_repo $SLACKBUILDS_DIR $SLACKBUILDS_SVN
 
+# Update keyring
+update_keyring $SLACKBUILDS_DIR/GPG-KEY
+
 # Get SlackBuild script
 BUILD_SCRIPT="`find_slackbuild $PACKAGE`"
 
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
 
 }
 
-- 
cgit v1.2.3