From 514766efcf2150970b5c7b2b347262569d2ae63f Mon Sep 17 00:00:00 2001 From: rhatto Date: Wed, 17 Dec 2008 16:50:59 +0000 Subject: minor fix git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@672 04377dda-e619-0410-9926-eae83683ac58 --- trunk/src/simplaret | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/trunk/src/simplaret b/trunk/src/simplaret index 9519cfe..df55526 100755 --- a/trunk/src/simplaret +++ b/trunk/src/simplaret @@ -674,10 +674,17 @@ function simplaret_get { # echo $folder/$candidate silent="--silent" fi - if [ -f "$folder/$candidate.asc" ] || [ "$SIGNATURE_CHECKING" == "$on" ]; then - gpg --verify $folder/$candidate.asc $folder/$candidate - if [ "$?" != "0" ]; then - echo "Package signature does not match. Removing package." + if [ "$SIGNATURE_CHECKING" == "$on" ]; then + if [ -f "$folder/$candidate.asc" ]; then + gpg --verify $folder/$candidate.asc $folder/$candidate + if [ "$?" != "0" ]; then + echo "Package signature does not match. Removing package." + rm -f $folder/$candidate.asc $folder/$candidate + LAST_DOWNLOADED_PACKAGE="" + return 1 + fi + else + echo "Missing signature. Removing package." rm -f $folder/$candidate.asc $folder/$candidate LAST_DOWNLOADED_PACKAGE="" return 1 -- cgit v1.2.3