diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-18 12:33:48 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-18 12:33:48 +0000 |
| commit | 1cdc61fa8e9014605439515b9f590ef1591b76e6 (patch) | |
| tree | 2e83021f39b8778b9dd9dd6e2b1e8810de19c58c /trunk | |
| parent | ebf8ab9d674570c0bd65d4b3190d6f8ae23e65fd (diff) | |
| download | simplepkg-1cdc61fa8e9014605439515b9f590ef1591b76e6.tar.gz simplepkg-1cdc61fa8e9014605439515b9f590ef1591b76e6.tar.bz2 | |
minor fix
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@674 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/lib/common.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index 53fc0f2..b10d8a9 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -1095,22 +1095,26 @@ function repo_gpg_key { local folder="$1" + if [ -z "$SIGN_KEYID$" ]; then + echo "GPG-KEY checking failed, no sign key id set." + fi + if [ $SIGN_PACKAGES -eq $on ]; then if [ -f "$folder/GPG-KEY" ]; then if ! gpg --with-colons < $folder/GPG-KEY | cut -d : -f 5 | grep -q -e "$SIGN_KEYID$"; then echo "Adding OpenPGP key id $SIGN_KEYID to $folder/GPG-KEY file..." if [ ! -z "$SIGN_PACKAGES_USER" ]; then - su $SIGN_PACKAGES_USER -c "gpg --export --armor $SIGN_KEY_ID" >> $folder/GPG-KEY + su $SIGN_PACKAGES_USER -c "gpg --export --armor $SIGN_KEYID" >> $folder/GPG-KEY else - gpg --export --armor $SIGN_KEY_ID >> $folder/GPG-KEY + gpg --export --armor $SIGN_KEYID >> $folder/GPG-KEY fi fi else echo "Adding OpenPGP key id $SIGN_KEYID to $folder/GPG-KEY file..." if [ ! -z "$SIGN_PACKAGES_USER" ]; then - su $SIGN_PACKAGES_USER -c "gpg --export --armor $SIGN_KEY_ID" > $folder/GPG-KEY + su $SIGN_PACKAGES_USER -c "gpg --export --armor $SIGN_KEYID" > $folder/GPG-KEY else - gpg --export --armor $SIGN_KEY_ID > $folder/GPG-KEY + gpg --export --armor $SIGN_KEYID > $folder/GPG-KEY fi fi svn_add $folder/GPG-KEY |