aboutsummaryrefslogtreecommitdiff
path: root/trunk
diff options
context:
space:
mode:
Diffstat (limited to 'trunk')
-rw-r--r--trunk/lib/common.sh12
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