emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 384504edf3 2/2: Ensure VC package names are not empty


From: Philip Kaludercic
Subject: emacs-29 384504edf3 2/2: Ensure VC package names are not empty
Date: Wed, 11 Jan 2023 03:29:01 -0500 (EST)

branch: emacs-29
commit 384504edf35751eec2be9b52be5d3b250217d68f
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    Ensure VC package names are not empty
    
    * lisp/emacs-lisp/package-vc.el (package-vc--unpack): Raise an error
    if the package name is empty.
    (package-vc-install): Avoid generating an empty file name, if a URL
    ends with a slash, and raise an error if the package name is empty.
---
 lisp/emacs-lisp/package-vc.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index ba1a01faee..b5b8a6746a 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -606,6 +606,8 @@ checkout.  This overrides the `:branch' attribute in 
PKG-SPEC."
                (name (package-desc-name pkg-desc))
                (dirname (package-desc-full-name pkg-desc))
                (pkg-dir (expand-file-name dirname package-user-dir)))
+    (when (string-empty-p name)
+      (user-error "Empty package name"))
     (setf (package-desc-dir pkg-desc) pkg-dir)
     (when (file-exists-p pkg-dir)
       (if (yes-or-no-p (format "Overwrite previous checkout for package `%s'?" 
name))
@@ -773,7 +775,9 @@ regular package, but it will not remove a VC package.
      (package-vc--archives-initialize)
      (let* ((name-or-url (package-vc--read-package-name
                           "Fetch and install package: " t))
-            (name (file-name-base name-or-url)))
+            (name (file-name-base (directory-file-name name-or-url))))
+       (when (string-empty-p name)
+         (user-error "Empty package name"))
        (list name-or-url
              (and current-prefix-arg :last-release)
              nil



reply via email to

[Prev in Thread] Current Thread [Next in Thread]