small fixes

1 files changed, 6 insertions, 2 deletions

diff --git a/firma b/firma
index 5fc1f01..f9e5f85 100755
--- a/firma
+++ b/firma
@@ -1218,7 +1218,7 @@ function UnsubscribeUser {
   local keyid="$($GPG_LIST_KEYS --with-fingerprint $1 2> /dev/null | grep ^fpr | cut -d : -f 10)"
 
   # check if its a valid email
-  if ! ValidEmail $1; then
+  if ! CheckValidEmail $1; then
     echo >&2 "unsub: \"$1\" is not an email address."
     return_code=1
   # check if user is trying to unsubscribe the list key
@@ -1407,6 +1407,7 @@ function GetSubscribersInfo {
 
   local key
   local keys
+  local keyid
 
   if [ "$1" == "help" ]; then
     echo "usage: info [all|email|help]"
@@ -1420,7 +1421,10 @@ function GetSubscribersInfo {
   fi
 
   for key in keys; do
-    $GPG --list-keys $key
+    keyid="$($GPG_LIST_KEYS --with-fingerprint $1 2> /dev/null | grep ^fpr | cut -d : -f 10)"
+    if [ ! -z "$keyid" ]; then
+      $GPG --list-keys $key
+    fi
   done
 
   return $?