[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#65649: [PATCH] package-vc: Continue installing package when document
From: |
Philip Kaludercic |
Subject: |
bug#65649: [PATCH] package-vc: Continue installing package when documentation build fails |
Date: |
Thu, 31 Aug 2023 07:18:01 +0000 |
Btw, watch out when reporting a bug, you shouldn't CC people directly,
but add a X-Debbugs-CC header
(https://debbugs.gnu.org/Reporting.html#xcc), as otherwise I'd be
creating a new bug report when responding to your message.
Joseph Turner <joseph@breatheoutbreathe.in> writes:
> It would be nice to report more information about the package with failed
> documentation, but AFAICT with-demoted-errors does not allow its FORMAT
> string to be a symbol whose value is a string.
What are the main errors we are concerned with? I am a bit concerned
that `with-demoted-errors' is a too coarse approach and might be applied
to widely in your current patch. It might be better to use a classical
condition-case and handle the right errors in the right place, or if
practicable try to detect if an error would occur before doing anything.
Also, the buffer *package-vc doc* should stay persistent and would
include error messages, that could also be used here.
> Joseph Turner <joseph@breatheoutbreathe.in> writes:
>
>> Oops, the format string should be %S, not %s.
>>
>> [2. text/x-diff;
>> 0001-Continue-installing-package-when-documentation-build.patch]
>> From 83c62d80b5199cee911e30c1f3bb03c5a585b689 Mon Sep 17 00:00:00 2001
>> From: Joseph Turner <joseph@breatheoutbreathe.in>
>> Date: Wed, 30 Aug 2023 23:24:16 -0700
>> Subject: [PATCH] Continue installing package when documentation building
>> fails
>>
>> * lisp/emacs-lisp/package-vc.el (package-vc--build-documentation):
>> Demote errors to messages.
>> ---
>> lisp/emacs-lisp/package-vc.el | 61 ++++++++++++++++++-----------------
>> 1 file changed, 31 insertions(+), 30 deletions(-)
>>
>> diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
>> index 747fe696204..bc1200c583f 100644
>> --- a/lisp/emacs-lisp/package-vc.el
>> +++ b/lisp/emacs-lisp/package-vc.el
>> @@ -409,36 +409,37 @@ prepared."
>> "Build documentation for package PKG-DESC from documentation source in
>> FILE.
>> FILE can be an Org file, indicated by its \".org\" extension,
>> otherwise it's assumed to be an Info file."
>> - (let* ((pkg-name (package-desc-name pkg-desc))
>> - (default-directory (package-desc-dir pkg-desc))
>> - (docs-directory (file-name-directory (expand-file-name file)))
>> - (output (expand-file-name (format "%s.info" pkg-name)))
>> - clean-up)
>> - (when (string-match-p "\\.org\\'" file)
>> - (require 'ox)
>> - (require 'ox-texinfo)
>> - (with-temp-buffer
>> - (insert-file-contents file)
>> - (setq file (make-temp-file "ox-texinfo-"))
>> - (let ((default-directory docs-directory))
>> - (org-export-to-file 'texinfo file))
>> - (setq clean-up t)))
>> - (with-current-buffer (get-buffer-create " *package-vc doc*")
>> - (erase-buffer)
>> - (cond
>> - ((/= 0 (call-process "makeinfo" nil t nil
>> - "-I" docs-directory
>> - "--no-split" file
>> - "-o" output))
>> - (message "Failed to build manual %s, see buffer %S"
>> - file (buffer-name)))
>> - ((/= 0 (call-process "install-info" nil t nil
>> - output (expand-file-name "dir")))
>> - (message "Failed to install manual %s, see buffer %S"
>> - output (buffer-name)))
>> - ((kill-buffer))))
>> - (when clean-up
>> - (delete-file file))))
>> + (with-demoted-errors "package-vc: Could not build documentation: %S"
>> + (let* ((pkg-name (package-desc-name pkg-desc))
>> + (default-directory (package-desc-dir pkg-desc))
>> + (docs-directory (file-name-directory (expand-file-name file)))
>> + (output (expand-file-name (format "%s.info" pkg-name)))
>> + clean-up)
>> + (when (string-match-p "\\.org\\'" file)
>> + (require 'ox)
>> + (require 'ox-texinfo)
>> + (with-temp-buffer
>> + (insert-file-contents file)
>> + (setq file (make-temp-file "ox-texinfo-"))
>> + (let ((default-directory docs-directory))
>> + (org-export-to-file 'texinfo file))
>> + (setq clean-up t)))
>> + (with-current-buffer (get-buffer-create " *package-vc doc*")
>> + (erase-buffer)
>> + (cond
>> + ((/= 0 (call-process "makeinfo" nil t nil
>> + "-I" docs-directory
>> + "--no-split" file
>> + "-o" output))
>> + (message "Failed to build manual %s, see buffer %S"
>> + file (buffer-name)))
>> + ((/= 0 (call-process "install-info" nil t nil
>> + output (expand-file-name "dir")))
>> + (message "Failed to install manual %s, see buffer %S"
>> + output (buffer-name)))
>> + ((kill-buffer))))
>> + (when clean-up
>> + (delete-file file)))))
>>
>> (defun package-vc-install-dependencies (deps)
>> "Install missing dependencies according to DEPS.
bug#65649: [PATCH] package-vc: Continue installing package when documentation build fails, Eli Zaretskii, 2023/08/31