bug#69019: [PATCH] package-vc: scan the correct directory for lisp files

[Philip Kaludercic <philipk@posteo.net>]

Steven Allen <steven@stebalien.com> writes:

> Following up on my previous patch (Bug#68761), we need to scan for
> package requirements inside the lisp-dir (if set), not in the root
> package directory.

Looks good, do you have any specific examples where this caused
problems?

>>From 5a4540756e5e30d12010ce58094aafacc1b8fe01 Mon Sep 17 00:00:00 2001
> From: Steven Allen <steven@stebalien.com>
> Date: Sat, 10 Feb 2024 10:05:11 -0800
> Subject: [PATCH] package-vc: scan the correct directory for lisp files
>
> Otherwise, we won't correctly detect package requirements.
>
> * lisp/emacs-lisp/package-vc.el (package-vc--unpack-1):
>   Scan 'lisp-dir', if set, for lisp files instead of scanning the root
>   package directory.

Just note that the convention of the commit message logs is not to
indent the lines here.  I can take care of that.

> ---
>  lisp/emacs-lisp/package-vc.el | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
> index fc402716dab..2730100b3d0 100644
> --- a/lisp/emacs-lisp/package-vc.el
> +++ b/lisp/emacs-lisp/package-vc.el
> @@ -501,8 +501,9 @@ package-vc--unpack-1
>  autoloads, generating a package description file (used to
>  identify a package as a VC package later on), building
>  documentation and marking the package as installed."
> -  (let ((pkg-spec (package-vc--desc->spec pkg-desc))
> -        missing)
> +  (let* ((pkg-spec (package-vc--desc->spec pkg-desc))
> +         (lisp-dir (plist-get pkg-spec :lisp-dir))
> +         missing)
>  
>      ;; In case the package was installed directly from source, the
>      ;; dependency list wasn't know beforehand, and they might have
> @@ -519,7 +520,7 @@ package-vc--unpack-1
>                  "\\|")
>               regexp-unmatchable))
>            (deps '()))
> -      (dolist (file (directory-files pkg-dir t "\\.el\\'" t))
> +      (dolist (file (directory-files (file-name-concat pkg-dir lisp-dir) t "\\.el\\'" t))
>          (unless (string-match-p ignored-files file)
>            (with-temp-buffer
>              (insert-file-contents file)
> @@ -542,8 +543,7 @@ package-vc--unpack-1
>            (pkg-file (expand-file-name (package--description-file pkg-dir) pkg-dir)))
>        ;; Generate autoloads
>        (let* ((name (package-desc-name pkg-desc))
> -             (auto-name (format "%s-autoloads.el" name))
> -             (lisp-dir (plist-get pkg-spec :lisp-dir)))
> +             (auto-name (format "%s-autoloads.el" name)))
>          (package-generate-autoloads
>           name (file-name-concat pkg-dir lisp-dir))
>          (when lisp-dir

-- 
Philip Kaludercic