Skip to content

Commit a277e11

Browse files
authored
Merge pull request #1208 from radian-software/rr-recipe-repo-clear-earlier
Fix ordering issue with el-get bootstrap
2 parents f72451d + 648f30a commit a277e11

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

bootstrap.el

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,21 +106,26 @@
106106
;; have to explicitly clear the caches.
107107
(straight--reset-caches)
108108

109-
;; First we register (and build) straight.el itself.
110-
(straight-use-package `(straight :type git :host github
111-
:repo ,(format "%s/straight.el"
112-
straight-repository-user)
113-
:files ("straight*.el")
114-
:branch ,straight-repository-branch))
115-
116109
;; Reset the tracking variable for `straight-recipe-repositories'. The
117110
;; user can customize `straight-initial-recipe-repositories' to change
118111
;; what is added here, or set it to nil and then register their own
119112
;; recipe repositories later. Either way, it's a requirement that
120113
;; anything added to this variable be added during every init, so it's
121114
;; okay to clear this.
115+
;;
116+
;; Need to clear the recipe repositories before registering the
117+
;; straight.el recipe, otherwise if recipe inheritance is enabled, the
118+
;; recipe repository names from last init may be looked up in
119+
;; themselves (looking at you el-get) which is no good.
122120
(setq straight-recipe-repositories nil)
123121

122+
;; First we register (and build) straight.el itself.
123+
(straight-use-package `(straight :type git :host github
124+
:repo ,(format "%s/straight.el"
125+
straight-repository-user)
126+
:files ("straight*.el")
127+
:branch ,straight-repository-branch))
128+
124129
;; Now let's clone any initially configured recipe repositories. We
125130
;; used to do this before straight.el, "so that any dependencies of
126131
;; straight.el can be looked up correctly", but straight.el doesn't

0 commit comments

Comments
 (0)