Skip to content

Commit 89d3867

Browse files
authored
Merge pull request #1205 from radian-software/rr-no-recipe-recurse
Improvements to recipe repo & inheritance handling
2 parents c5baeaa + 00c62bf commit 89d3867

File tree

1 file changed

+20
-7
lines changed

1 file changed

+20
-7
lines changed

straight.el

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3937,11 +3937,18 @@ for dependency resolution."
39373937
;; Emacs 28 and below.
39383938
(dflt
39393939
(or
3940-
(when-let ((retrieved (straight-recipes-retrieve
3941-
package
3942-
(if (listp sources)
3943-
sources
3944-
(list sources)))))
3940+
(when-let
3941+
((retrieved
3942+
(straight-recipes-retrieve
3943+
package
3944+
(if (listp sources)
3945+
sources
3946+
(list sources))
3947+
(concat cause
3948+
(when cause straight-arrow)
3949+
(format
3950+
"Computing recipe inheritance for %S"
3951+
package)))))
39453952
;; Recipes retrieved from files may be backquoted.
39463953
(cdr (if (straight--quoted-form-p retrieved)
39473954
(eval retrieved) retrieved)))
@@ -6311,8 +6318,14 @@ include a nil `:build' property, to unconditionally
63116318
inhibit the build phase.
63126319

63136320
This function also adds the recipe repository to
6314-
`straight-recipe-repositories', at the end of the list."
6315-
(straight-use-package-lazy melpa-style-recipe)
6321+
`straight-recipe-repositories', at the end of the list.
6322+
6323+
Existing recipe repositories are not searched for a recipe for the
6324+
recipe repository you are trying to register, because that is strange
6325+
and confusing. If you explicitly want this behavior, you can use the
6326+
`straight-use-package' API directly."
6327+
(let ((straight-recipe-repositories nil))
6328+
(straight-use-package-lazy melpa-style-recipe))
63166329
(add-to-list 'straight-recipe-repositories
63176330
(if (listp melpa-style-recipe)
63186331
(car melpa-style-recipe)

0 commit comments

Comments
 (0)