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

Fix doom update #1584

Browse source 
It would no-op if you responded "y" to the 'update them?' prompt, and
proceed if you responded "n".

Doom must be in its rebellious phase.

Also relevant: #1585
This commit is contained in:
Henrik Lissner 2019-07-22 21:35:27 +02:00
parent 22404f1ec5
commit a301330603
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 41 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/cli/packages.el
View file

@ -166,9 +166,11 @@ a list of packages that will be updated."
(nconc specs (async-get (pop futures)))) (nconc specs (async-get (pop futures))))
(terpri) (terpri)
(if-let (specs (delq nil (cdr specs))) (if-let (specs (delq nil (cdr specs)))
(if (or auto-accept-p (if (not
(or auto-accept-p
(y-or-n-p (y-or-n-p
(format! "%s\n\nThere %s %d package%s available to update. Update them?" (format!
"%s\n\nThere %s %d package%s available to update. Update them?"
(mapconcat (mapconcat
(lambda (spec) (lambda (spec)
(cl-destructuring-bind (n pretime time recipe) spec (cl-destructuring-bind (n pretime time recipe) spec
@ -181,7 +183,8 @@ a list of packages that will be updated."
"\n") "\n")
(if (cdr specs) "are" "is") (if (cdr specs) "are" "is")
(length specs) (length specs)
(if (cdr specs) "s" "")))) (if (cdr specs) "s" "")))))
(ignore (print! (info "Aborted update")))
(terpri) (terpri)
(dolist (spec specs t) (dolist (spec specs t)
(cl-destructuring-bind (n pretime time recipe) spec (cl-destructuring-bind (n pretime time recipe) spec
@ -203,9 +206,7 @@ a list of packages that will be updated."
(straight--build-package recipe " ")) (straight--build-package recipe " "))
(with-current-buffer (straight--process-get-buffer) (with-current-buffer (straight--process-get-buffer)
(with-silent-modifications (with-silent-modifications
(erase-buffer)))))) (erase-buffer)))))))
(print! (info "Aborted update"))
nil)
(print! (success "No packages to update")) (print! (success "No packages to update"))
nil))) nil)))
(error (error