aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-12-17 16:50:59 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-12-17 16:50:59 +0000
commit514766efcf2150970b5c7b2b347262569d2ae63f (patch)
tree74feff7e8c3f3c87d41cde8cd675b6c8ddfa86ea
parent0ff995372cc40fb503b63e31564f6a4f22f564ff (diff)
downloadsimplepkg-514766efcf2150970b5c7b2b347262569d2ae63f.tar.gz
simplepkg-514766efcf2150970b5c7b2b347262569d2ae63f.tar.bz2
minor fix
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@672 04377dda-e619-0410-9926-eae83683ac58
-rwxr-xr-xtrunk/src/simplaret15
1 files 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