Mercurial > hg > xemacs-beta
diff lisp/package-get.el @ 927:e40f8d860d5f
[xemacs-hg @ 2002-07-17 06:13:39 by youngs]
2002-07-17 Steve Youngs <youngs@xemacs.org>
* package-get.el (package-get-update-base-from-buffer): Re-write
so it doesn't rely on the APEL package.
| author | youngs |
|---|---|
| date | Wed, 17 Jul 2002 06:13:39 +0000 |
| parents | eb3bc15a6e0f |
| children | 4ee231b26c65 |
line wrap: on
line diff
--- a/lisp/package-get.el Tue Jul 16 08:27:11 2002 +0000 +++ b/lisp/package-get.el Wed Jul 17 06:13:39 2002 +0000 @@ -441,23 +441,29 @@ (setq package-get-continue-update-base t) (if package-get-require-signed-base-updates (if package-entries-are-signed - (progn - (setq package-get-continue-update-base nil) - (autoload 'mc-setversion "mc-setversion") - (with-fboundp 'mc-setversion - (if-boundp 'exec-suffix-list - (or - (cond ((locate-file "gpg" exec-path exec-suffix-list) - (mc-setversion "gpg")) - ((locate-file "pgpe" exec-path exec-suffix-list) - (mc-setversion "5.0")) - ((locate-file "pgp" exec-path exec-suffix-list) - (mc-setversion "2.6"))) - (error "Can't find a suitable pgp executable")) - (error 'unimplemented "`apel' package unavailable"))) - (autoload 'mc-verify "mc-toplev") - (declare-fboundp (mc-verify)) - (setq package-get-continue-update-base t)) + (if (featurep 'mailcrypt-autoloads) + (progn + (setq package-get-continue-update-base nil) + (autoload 'mc-setversion "mc-setversion") + (cond ((locate-file "gpg" exec-path + '("" ".btm" ".bat" ".cmd" ".exe" ".com") + 'executable) + (mc-setversion "gpg")) + ((locate-file "pgpe" exec-path + '("" ".btm" ".bat" ".cmd" ".exe" ".com") + 'executable) + (mc-setversion "5.0")) + ((locate-file "pgp" exec-path + '("" ".btm" ".bat" ".cmd" ".exe" ".com") + 'executable) + (mc-setversion "2.6")) + (t + (error 'search-failed + "Can't find a suitable PGP executable"))) + (autoload 'mc-verify "mc-toplev") + (declare-fboundp (mc-verify)) + (setq package-get-continue-update-base t)) + (error 'unimplemented "`mailcrypt' package unavailable")) (if (yes-or-no-p "Package Index is not PGP signed. Continue anyway? ") (setq package-get-continue-update-base t)