emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix double package-refresh on first install

Browse source
This commit is contained in:
Henrik Lissner 2017-06-06 12:01:10 +02:00
parent 7005ae13d7
commit a2f14183a1
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/autoload/packages.el
View file

@ -9,7 +9,8 @@
(doom-initialize) (doom-initialize)
(when force-p (when force-p
(doom-refresh-clear-cache)) (doom-refresh-clear-cache))
(unless (persistent-soft-fetch 'last-pkg-refresh "emacs") (unless (or (persistent-soft-fetch 'last-pkg-refresh "emacs")
doom--refresh-p)
(condition-case ex (condition-case ex
(progn (progn
(message "Refreshing package archives") (message "Refreshing package archives")
@ -25,6 +26,7 @@
;;;###autoload ;;;###autoload
(defun doom-refresh-clear-cache () (defun doom-refresh-clear-cache ()
"Clear the cache for `doom-refresh-packages'." "Clear the cache for `doom-refresh-packages'."
(setq doom--refresh-p nil)
(persistent-soft-store 'last-pkg-refresh nil "emacs")) (persistent-soft-store 'last-pkg-refresh nil "emacs"))
;;;###autoload ;;;###autoload

5
core/core-packages.el
View file

@ -74,6 +74,8 @@ missing) and shouldn't be deleted.")
"A backup of `load-path' before it was altered by `doom-initialize'. Used as a "A backup of `load-path' before it was altered by `doom-initialize'. Used as a
base by `doom!' and for calculating how many packages exist.") base by `doom!' and for calculating how many packages exist.")
(defvar doom--refresh-p nil)
(setq load-prefer-newer noninteractive (setq load-prefer-newer noninteractive
package--init-file-ensured t package--init-file-ensured t
package-user-dir (expand-file-name "elpa" doom-packages-dir) package-user-dir (expand-file-name "elpa" doom-packages-dir)
@ -148,7 +150,8 @@ to speed up startup."
;; Ensure core packages are installed ;; Ensure core packages are installed
(let ((core-packages (cl-remove-if #'package-installed-p doom-core-packages))) (let ((core-packages (cl-remove-if #'package-installed-p doom-core-packages)))
(when core-packages (when core-packages
(package-refresh-contents) (package-refresh-contents t)
(setq doom--refresh-p t)
(dolist (pkg core-packages) (dolist (pkg core-packages)
(let ((inhibit-message t)) (let ((inhibit-message t))
(package-install pkg)) (package-install pkg))