diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2009-01-22 02:11:49 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2009-01-22 02:11:49 +0000 |
| commit | 97ddcb1fbc4f042818581017a6999aa37ba015c9 (patch) | |
| tree | ee927e723af2698d5c2e099ff7837158d48012fa | |
| parent | 9bdbd82aa16d3ff0b4cd2828adde49a73c3f1c9b (diff) | |
| download | simplepkg-97ddcb1fbc4f042818581017a6999aa37ba015c9.tar.gz simplepkg-97ddcb1fbc4f042818581017a6999aa37ba015c9.tar.bz2 | |
hopefully fixing #41
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@767 04377dda-e619-0410-9926-eae83683ac58
| -rw-r--r-- | trunk/lib/common.sh | 2 | ||||
| -rwxr-xr-x | trunk/src/mkbuild | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index c3b09d6..78b8be8 100644 --- 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 0f786e1..049cfc9 100755 --- 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 |