From 7e792325124393a8a861943472a2b98461be5f18 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Sat, 21 Jun 2025 10:08:09 -0400 Subject: [PATCH 1/2] download_strategy: fossil now outputs `hash:` --- Library/Homebrew/download_strategy.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index d5c517458a..23007362d0 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -1542,7 +1542,7 @@ class FossilDownloadStrategy < VCSDownloadStrategy sig { override.returns(Time) } def source_modified_time out = silent_command("fossil", args: ["info", "tip", "-R", cached_location]).stdout - Time.parse(T.must(out[/^uuid: +\h+ (.+)$/, 1])) + Time.parse(T.must(out[/^(hash|uuid): +\h+ (.+)$/, 1])) end # Return last commit's unique identifier for the repository. @@ -1551,7 +1551,7 @@ class FossilDownloadStrategy < VCSDownloadStrategy sig { override.returns(String) } def last_commit out = silent_command("fossil", args: ["info", "tip", "-R", cached_location]).stdout - T.must(out[/^uuid: +(\h+) .+$/, 1]) + T.must(out[/^(hash|uuid): +(\h+) .+$/, 1]) end sig { override.returns(T::Boolean) } From 8a4cac02385571663ed055d3f3321c9c1cf8cbc5 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Sat, 21 Jun 2025 10:13:39 -0400 Subject: [PATCH 2/2] download_strategy: fix `cvs` checkouts --- Library/Homebrew/download_strategy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index 23007362d0..6f52c2b6db 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -1350,7 +1350,7 @@ class CVSDownloadStrategy < VCSDownloadStrategy end command! "cvs", - args: [*quiet_flag, "-d", @url, "checkout", "-d", cached_location.basename, @module], + args: [*quiet_flag, "-d", @url, "checkout", "-d", basename.to_s, @module], chdir: cached_location.dirname, timeout: Utils::Timer.remaining(timeout) end