@@ -320,6 +320,8 @@ def prelude_fetch
320
320
# Needs to be done before expand_dependencies for compute_dependencies
321
321
fetch_bottle_tab if pour_bottle?
322
322
323
+ fetch_fetch_deps unless ignore_deps?
324
+
323
325
@ran_prelude_fetch = true
324
326
end
325
327
@@ -346,7 +348,9 @@ def prelude
346
348
forbidden_formula_check
347
349
348
350
check_install_sanity
349
- install_fetch_deps unless ignore_deps?
351
+
352
+ # with the download queue: these should have already been installed
353
+ install_fetch_deps if !ignore_deps? && download_queue . nil?
350
354
end
351
355
352
356
sig { void }
@@ -475,6 +479,18 @@ def check_install_sanity
475
479
sig { params ( _formula : Formula ) . returns ( T . nilable ( T ::Boolean ) ) }
476
480
def fresh_install? ( _formula ) = false
477
481
482
+ sig { void }
483
+ def fetch_fetch_deps
484
+ return if @compute_dependencies . blank?
485
+
486
+ compute_dependencies ( use_cache : false ) if @compute_dependencies . any? do |dep , |
487
+ next false unless dep . implicit?
488
+
489
+ fetch_dependencies
490
+ true
491
+ end
492
+ end
493
+
478
494
sig { void }
479
495
def install_fetch_deps
480
496
return if @compute_dependencies . blank?
@@ -1455,8 +1471,6 @@ def fetch
1455
1471
# We also skip bottle installs from local bottle paths, as these are done in CI
1456
1472
# as part of the build lifecycle before attestations are produced.
1457
1473
if check_attestation &&
1458
- # TODO: support this for download queues at some point
1459
- download_queue . nil? &&
1460
1474
Homebrew ::Attestation . enabled? &&
1461
1475
formula . tap &.core_tap? &&
1462
1476
formula . name != "gh"
@@ -1545,7 +1559,7 @@ def pour
1545
1559
# download queue has already done the actual staging but we'll lie about
1546
1560
# pouring now for nicer output
1547
1561
ohai "Pouring #{ downloadable . downloader . basename } "
1548
- downloadable . downloader . stage unless download_queue
1562
+ downloadable . downloader . stage if download_queue . nil? || ! formula . prefix . exist?
1549
1563
end
1550
1564
1551
1565
Tab . clear_cache
0 commit comments