]> gitweb.fluxo.info Git - simplepkg.git/commitdiff
minor fix
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Wed, 17 Dec 2008 16:50:59 +0000 (16:50 +0000)
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Wed, 17 Dec 2008 16:50:59 +0000 (16:50 +0000)
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@672 04377dda-e619-0410-9926-eae83683ac58

trunk/src/simplaret

index 9519cfe9309eb9edd6909029a6b6ad5eab087d46..df5552666a9109379cfdbaed517a74d99102443d 100755 (executable)
@@ -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