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

Fix void-variable package error on 'doom update'

Browse source
This commit is contained in:
Henrik Lissner 2019-08-07 17:22:46 -04:00
parent b2aec5f546
commit 4a92d12267
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/cli/packages.el
View file

@ -140,9 +140,9 @@ a list of packages that will be installed."
(let (packages errors) (let (packages errors)
(load ,(concat doom-core-dir "core.el")) (load ,(concat doom-core-dir "core.el"))
(dolist (recipe ',group) (dolist (recipe ',group)
(condition-case e (straight--with-plist recipe
(straight--with-plist recipe (package local-repo remote upstream-repo upstream-host)
(package local-repo remote upstream-repo upstream-host) (condition-case e
;; HACK There's a contingency of `straight-fetch-package' ;; HACK There's a contingency of `straight-fetch-package'
;; where it will pop up a window for confirmation, but this ;; where it will pop up a window for confirmation, but this
;; window is invisible because a) this command runs in a ;; window is invisible because a) this command runs in a
@ -167,9 +167,9 @@ a list of packages that will be installed."
(shell-command-to-string "git log -1 --format=%at HEAD"))) (shell-command-to-string "git log -1 --format=%at HEAD")))
(time (time
(string-to-number (string-to-number
;; HACK `straight--get-call' has a higher ;; HACK `straight--get-call' has a higher failure
;; failure rate when querying FETCH_HEAD; not ;; rate when querying FETCH_HEAD; not sure why.
;; sure why. Doing this manually, with ;; Doing this manually, with
;; `shell-command-to-string' works fine. ;; `shell-command-to-string' works fine.
(shell-command-to-string "git log -1 --format=%at FETCH_HEAD")))) (shell-command-to-string "git log -1 --format=%at FETCH_HEAD"))))
(with-current-buffer (straight--process-get-buffer) (with-current-buffer (straight--process-get-buffer)
@ -178,10 +178,10 @@ a list of packages that will be installed."
(erase-buffer))) (erase-buffer)))
(when (> n 0) (when (> n 0)
(push (list n pretime time recipe) (push (list n pretime time recipe)
packages))))) packages))))
(error (error
(push (list package e (string-trim (or (straight--process-get-output) ""))) (push (list package e (string-trim (or (straight--process-get-output) "")))
errors)))) errors)))))
(if errors (if errors
(cons 'error errors) (cons 'error errors)
(cons 'ok (nreverse packages)))) (cons 'ok (nreverse packages))))