From f1a2d0e19ba6d44fffad8d02bcc2f9782b081247 Mon Sep 17 00:00:00 2001 From: slakmagik Date: Thu, 27 May 2010 22:14:16 +0000 Subject: [PATCH] Reverted the check_gpg() part of r797; added real fix Another 'brown paper bag' commit. This is hopefully the real fix, deleting the line from info_item() that actually echos 'OK'. --- src/usr/sbin/sbopkg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg index 96daff2..8e351f6 100755 --- a/src/usr/sbin/sbopkg +++ b/src/usr/sbin/sbopkg @@ -1236,7 +1236,6 @@ info_item() { Options ) add_options $APP ;; "Check GPG" ) if [[ ! -z $REPO_GPG ]]; then - echo "OK" check_gpg $SHORTPATH CHKRETVAL=$? if [[ $CHKRETVAL == 0 ]]; then @@ -1323,7 +1322,7 @@ check_gpg() { $GPGNAME tarball found.")" 8 40 return 1 fi - if ! gpg --verify $CHKPKG.*.asc &> /dev/null 2>&1; then + if ! gpg --verify $CHKPKG.*.asc > /dev/null 2>&1; then dialog --title "WARNING" --yesno "$(crunch "GPG CHECK FAILED!\n\n \ Would you like to delete the $GPGNAME directory and tarball \ so you can perform a new sync? If so, all local changes to \