diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2022-08-02 17:12:45 +0200 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2022-08-02 17:12:45 +0200 |
| commit | ffb06d910043bcbfad939e43442f81fe3421f0d5 (patch) | |
| tree | e28c1481ab5d0baf61f5c6f835fd00e97f31bcb0 /lisp/emacs-lisp | |
| parent | 168929cf0d722a2fb52d3442b030b755d5e9c1b3 (diff) | |
| download | emacs-ffb06d910043bcbfad939e43442f81fe3421f0d5.tar.gz emacs-ffb06d910043bcbfad939e43442f81fe3421f0d5.tar.bz2 emacs-ffb06d910043bcbfad939e43442f81fe3421f0d5.zip | |
Assume VC data is directly usable in 'package-archive-contents'
* package-vc.el (package-vc-fetch): Remove string parsing and
translation code.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package-vc.el | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index 7e76725a05c..f5263d08b96 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -184,26 +184,14 @@ be requested using REV." (:rev . ,rev)))) ((when-let* ((desc (cadr (assoc name-or-url package-archive-contents #'string=))) - (spec (or (alist-get :vc (package-desc-extras desc)) - (user-error "Package has no VC header")))) - (unless (string-match - (rx bos - (group (+ alnum)) - (+ blank) (group (+ (not blank))) - (? (+ blank) (group (+ (not blank))) - (? (+ blank) (group (+ (not blank))))) - eos) - spec) - (user-error "Invalid repository specification %S" spec)) + (upstream (or (alist-get :vc (package-desc-extras desc)) + (user-error "Package has no VC data")))) (package-desc-create :name (if (stringp name-or-url) (intern name-or-url) name-or-url) :kind 'vc - :extras `((:upstream . ,(list (intern (match-string 1 spec)) - (match-string 2 spec) - (match-string 3 spec) - (match-string 4 spec))) + :extras `((:upstream . ,upstream) (:rev . ,rev))))) ((user-error "Unknown package to fetch: %s" name-or-url))))) |