From 8b27d19e0bf036b242147b0e4a70cd337e10f2af Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 20 Jul 2019 11:05:52 +0200 Subject: [PATCH] Fix "err=[-50]" gnutls error When updating/installing packages. --- core/autoload/packages.el | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/core/autoload/packages.el b/core/autoload/packages.el index 78d905354..723d21c0e 100644 --- a/core/autoload/packages.el +++ b/core/autoload/packages.el @@ -19,28 +19,6 @@ (setq doom--refreshed-p nil) (doom-cache-set 'last-pkg-refresh nil)) -(defun doom--refresh-pkg-contents () - (unless (file-exists-p package-user-dir) - (make-directory package-user-dir t)) - (require 'gnutls) - (let ((old-gnutls-algorithm-priority gnutls-algorithm-priority)) - ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3434 - (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3") - (unwind-protect - (progn - (let ((default-keyring (expand-file-name "package-keyring.gpg" - data-directory))) - (when (and package-check-signature (file-exists-p default-keyring)) - (condition-case-unless-debug error - (package-import-keyring default-keyring) - (error (message "Cannot import default keyring: %S" (cdr error)))))) - (dolist (archive package-archives) - (cl-pushnew archive package--downloads-in-progress - :test #'equal)) - (dolist (archive package-archives) - (package--download-one-archive archive "archive-contents" nil))) - (setq gnutls-algorithm-priority old-gnutls-algorithm-priority)))) - ;;;###autoload (defun doom-refresh-packages-maybe (&optional force-p) "Refresh ELPA packages, if it hasn't been refreshed recently." @@ -51,12 +29,11 @@ (condition-case e (progn (message "Refreshing package archives") - (doom--refresh-pkg-contents) + (package-refresh-contents) (doom-cache-set 'last-pkg-refresh t 1200)) - ((debug error) - (message "Trying again %s" e) - (doom--refresh-pkg-contents) - (signal 'doom-error e))))) + ((debug error) + (doom--refresh-pkg-cache) + (signal 'doom-error e))))) ;;