Skip to content

Commit

Permalink
[bot] "built_in_updates" Fri Nov 15 04:04:42 UTC 2024
Browse files Browse the repository at this point in the history
  • Loading branch information
SpacemacsBot authored and smile13241324 committed Nov 15, 2024
1 parent 469babd commit c3269f6
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions core/libs/package-build.el
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ Return (COMMIT-HASH COMMITTER-DATE VERSION-STRING REVDESC) or nil.
(list rcommit rtime (package-version-join version) rrevdesc tag)))))

(defun package-build--ensure-count-increase (rcp version ahead)
(if-let* ((previous (cdr (assq (intern (oref rcp name))
(if-let ((previous (cdr (assq (intern (oref rcp name))
(package-build-archive-alist)))))
;; Because upstream may have rewritten history, we cannot be certain
;; that appending the new count of commits would result in a version
Expand Down Expand Up @@ -1282,14 +1282,14 @@ is the same as the value of `export_file_name'."
"Invalid package name in dependency: %S" pkg))
(list pkg ver))
(eval deps)))
(when-let* ((v (or (alist-get :url plist)
(when-let ((v (or (alist-get :url plist)
(alist-get :homepage plist))))
(oset rcp webpage v))
(when-let* ((v (alist-get :keywords plist)))
(when-let ((v (alist-get :keywords plist)))
(oset rcp keywords v))
(when-let* ((v (alist-get :maintainers plist)))
(when-let ((v (alist-get :maintainers plist)))
(oset rcp maintainers v))
(when-let* ((v (alist-get :authors plist)))
(when-let ((v (alist-get :authors plist)))
(oset rcp authors v)))))))

(defun package-build--normalize-summary (summary)
Expand Down Expand Up @@ -1554,7 +1554,7 @@ in `package-build-archive-dir'."
(package-build--message "Running %s" command)
(package-build--call-sandboxed
rcp shell-file-name shell-command-switch command))
(when-let* ((package-build-run-recipe-make-targets)
(when-let ((package-build-run-recipe-make-targets)
(targets (oref rcp make-targets)))
(package-build--message "Running make %s" (string-join targets " "))
(apply #'package-build--call-sandboxed rcp "make" targets))
Expand Down
8 changes: 4 additions & 4 deletions core/libs/package-recipe.el
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,15 @@ a message for each invalid recipe."
(cl-assert (not (plist-get plist :url)) ":url is redundant"))
(cl-assert (plist-get plist :url) ":url is missing")))
(dolist (key symbol-keys)
(when-let* ((val (plist-get plist key)))
(when-let ((val (plist-get plist key)))
(cl-assert (symbolp val) nil "%s must be a symbol but is %S" key val)))
(dolist (key list-keys)
(when-let* ((val (plist-get plist key)))
(when-let ((val (plist-get plist key)))
(cl-assert (listp val) nil "%s must be a list but is %S" key val)))
(dolist (key string-keys)
(when-let* ((val (plist-get plist key)))
(when-let ((val (plist-get plist key)))
(cl-assert (stringp val) nil "%s must be a string but is %S" key val)))
(when-let* ((spec (plist-get plist :files)))
(when-let ((spec (plist-get plist :files)))
;; `:defaults' is only allowed as the first element.
;; If we find it in that position, skip over it.
(when (eq (car spec) :defaults)
Expand Down
18 changes: 9 additions & 9 deletions core/libs/quelpa.el
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ On error return nil."
OP is taking two version list and comparing."
(let ((ver (if version (version-to-list version) quelpa--min-ver))
(pkg-ver
(or (when-let* ((pkg-desc (cdr (assq name package-alist)))
(or (when-let ((pkg-desc (cdr (assq name package-alist)))
(pkg-ver (package-desc-version (car pkg-desc))))
pkg-ver)
(alist-get name package--builtin-versions)
Expand Down Expand Up @@ -294,7 +294,7 @@ already and should not be upgraded etc)."
((or (not (equal ver-type 'elpa)) quelpa-stable-p) melpa-ver)
(melpa-ver
(let ((base-ver
(if-let* ((info (quelpa-build--pkg-info (symbol-name name)
(if-let ((info (quelpa-build--pkg-info (symbol-name name)
files build-dir)))
(aref info 3)
'(0 0 0))))
Expand Down Expand Up @@ -326,7 +326,7 @@ already and should not be upgraded etc)."
(or (funcall package-strip-rcs-id-orig (lm-header "package-version"))
(funcall package-strip-rcs-id-orig (lm-header "version"))
"0"))))
(concat (if-let* ((desc (quelpa-get-package-desc file-path)))
(concat (if-let ((desc (quelpa-get-package-desc file-path)))
(mapconcat #'number-to-string (package-desc-version desc) ".")
"0")
(pcase version
Expand Down Expand Up @@ -932,7 +932,7 @@ Return a cons cell whose `car' is the root and whose `cdr' is the repository."
(repo (plist-get config :url))
(remote (or (plist-get config :remote) "origin"))
(commit (or (plist-get config :commit)
(when-let* ((branch (plist-get config :branch)))
(when-let ((branch (plist-get config :branch)))
(concat remote "/" branch))))
(depth (or (plist-get config :depth) quelpa-git-clone-depth))
(partial (and (or (plist-get config :partial) quelpa-git-clone-partial)
Expand Down Expand Up @@ -964,7 +964,7 @@ Return a cons cell whose `car' is the root and whose `cdr' is the repository."
(when (and depth (not (plist-get config :commit)))
`("--depth" ,(int-to-string depth)
"--no-single-branch"))
(when-let* ((branch (plist-get config :branch)))
(when-let ((branch (plist-get config :branch)))
`("--branch" ,branch))))))
(if quelpa-build-stable
(let* ((min-bound (goto-char (point-max)))
Expand Down Expand Up @@ -1324,7 +1324,7 @@ If KEEP-VERSION is set, don't override with version 0."
(extras (let (alist)
(while rest-plist
(unless (memq (car rest-plist) '(:kind :archive))
(when-let* ((value (cadr rest-plist)))
(when-let ((value (cadr rest-plist)))
(push (cons (car rest-plist)
(if (eq (car-safe value) 'quote)
(cadr value)
Expand Down Expand Up @@ -1900,7 +1900,7 @@ Return new package version."
"Delete obsoleted packages with name NAME.
With NEW-VERSION, will delete obsoleted packages that are not in same
version."
(when-let* ((all-pkgs (alist-get name package-alist))
(when-let ((all-pkgs (alist-get name package-alist))
(new-pkg-version (or new-version
(package-desc-version (car all-pkgs)))))
(with-demoted-errors "Error deleting package: %S"
Expand All @@ -1911,7 +1911,7 @@ version."
(package-delete pkg-desc 'force))))
all-pkgs))
;; Only packages with same version remained. Just pick the first one.
(when-let* (all-pkgs (alist-get name package-alist))
(when-let (all-pkgs (alist-get name package-alist))
(setf (cdr all-pkgs) nil))))

;; --- public interface ------------------------------------------------------
Expand Down Expand Up @@ -2003,7 +2003,7 @@ given package and remove any old versions of it even if the
(cache-item (quelpa-arg-rcp arg)))
(quelpa-parse-plist plist)
(quelpa-parse-stable cache-item)
(when-let* ((ver (apply #'quelpa-package-install arg plist)))
(when-let ((ver (apply #'quelpa-package-install arg plist)))
(when quelpa-autoremove-p
(quelpa--delete-obsoleted-package (car cache-item) ver))
(quelpa-update-cache cache-item))))
Expand Down

0 comments on commit c3269f6

Please sign in to comment.