admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #12126 from Bo98/bottle-rebuild-json

Browse Source 
utils/bottles: fix local JSON handling for bottle rebuilds
This commit is contained in:
Bo Anderson 2021-09-27 04:09:59 +01:00 committed by GitHub
commit fef4ba00de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/utils/bottles.rb
View File

@ -59,7 +59,7 @@ module Utils
receipt_file = file_from_bottle(bottle_file, receipt_file_path) receipt_file = file_from_bottle(bottle_file, receipt_file_path)
tap = Tab.from_file_content(receipt_file, "#{bottle_file}/#{receipt_file_path}").tap tap = Tab.from_file_content(receipt_file, "#{bottle_file}/#{receipt_file_path}").tap
"#{tap}/#{name}" if tap.present? && !tap.core_tap? "#{tap}/#{name}" if tap.present? && !tap.core_tap?
elsif (bottle_json_path = Pathname(bottle_file.sub(/\.tar\.gz$/, ".json"))) && elsif (bottle_json_path = Pathname(bottle_file.sub(/\.(\d+\.)?tar\.gz$/, ".json"))) &&
bottle_json_path.exist? && bottle_json_path.exist? &&
(bottle_json_path_contents = bottle_json_path.read.presence) && (bottle_json_path_contents = bottle_json_path.read.presence) &&
(bottle_json = JSON.parse(bottle_json_path_contents).presence) && (bottle_json = JSON.parse(bottle_json_path_contents).presence) &&
@ -98,7 +98,7 @@ module Utils
def load_tab(formula) def load_tab(formula)
keg = Keg.new(formula.prefix) keg = Keg.new(formula.prefix)
tabfile = keg/Tab::FILENAME tabfile = keg/Tab::FILENAME
bottle_json_path = formula.local_bottle_path&.sub(/\.tar\.gz$/, ".json") bottle_json_path = formula.local_bottle_path&.sub(/\.(\d+\.)?tar\.gz$/, ".json")
if (tab_attributes = formula.bottle_tab_attributes.presence) if (tab_attributes = formula.bottle_tab_attributes.presence)
Tab.from_file_content(tab_attributes.to_json, tabfile) Tab.from_file_content(tab_attributes.to_json, tabfile)