Changeset 12878

Timestamp:

08/08/10 20:41:08 (13 years ago)

Author:

Mark Evenson

Message:

Interactive restart to skip missing GPG signature.

A pretty awful hack using a DEFVAR form to communicate state from an
interactive restart makes it seem like I didn't get the memo about how
to use the Lisp condition system properly. Mea culpa! But it looks
like the code from how SBCL handles this would be a better place to go
then what we have currently.

File:

• trunk/abcl/contrib/asdf-install/installer.lisp (modified) (1 diff)

trunk/abcl/contrib/asdf-install/installer.lisp

@@ -152 +152 @@
   (concatenate 'string url ".asc"))
 
+;;; XXX unsightful hack
+(defvar *dont-check-signature* nil)
+
 (defun download-files-for-package (package-name-or-url)
+  (setf *dont-check-signature* nil)
   (multiple-value-bind (package-url package-file) 
       (download-url-to-temporary-file
        (download-link-for-package package-name-or-url))
     (if (verify-gpg-signatures-p package-name-or-url)
-  (multiple-value-bind (signature-url signature-file) 
-      (download-url-to-temporary-file
-       (download-link-for-signature package-url))
-    (declare (ignore signature-url))
-    (values package-file signature-file))
+        (restart-case
+            (multiple-value-bind (signature-url signature-file) 
+                (download-url-to-temporary-file
+                 (download-link-for-signature package-url))
+              (declare (ignore signature-url))
+              (values package-file signature-file))
+          (skip-gpg-check () 
+            :report "Don't check GPG signature for this package"
+            (progn
+              (setf *dont-check-signature* t)
+              (values package-file nil))))
   (values package-file nil))))
   
 (defun verify-gpg-signature (file-name signature-name)
   (block verify
+    (when (and (null signature-name) *dont-check-signature*)
+      (return-from verify t))
     (loop
       (restart-case