hopefully fixing #41

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@767 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index c3b09d67620e67610b0d2d374a942108d2634276..78b8be863e6529e1adde3c703d5fbc7ed4b6d2ed 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -1696,7 +1696,7 @@ function update_keyring  {
   keyring="$1"
 
   if [ ! -e "$keyring" ]; then
-    repo_gpg_key $MKBUILDS_DIR
+    repo_gpg_key `dirname $keyring`
     return
   fi
   

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index 0f786e1bd32c0fc1dec10a6fb8294fe032b2d29c..049cfc977f72afb13e6361bd0200c4645bdb7cd0 100755 (executable)
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -714,10 +714,6 @@ function submit_mkbuild {
 
   submit_cleanup
 
-  if [ "$SIGN_MANIFESTS" -eq $on ]; then
-    repo_gpg_key $MKBUILDS_DIR
-  fi
-
   cd $WORK
 
 }
@@ -1449,6 +1445,11 @@ function make_slackbuild {
   verbose -e "\nEdit others [[]] parameters ..."
   change_other_parameters
 
+  if [ "$SIGN_MANIFESTS" -eq $on ]; then
+    mkbuild_update_keyring
+    repo_gpg_key $MKBUILDS_DIR
+  fi
+
   # Update Manifest file
   edit_manifest