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

bottle: JSON-related tweaks/fixes.

Browse Source
This commit is contained in:
Mike McQuaid 2016-05-28 16:46:34 +01:00
parent 53b280c592
commit 9edb1a7a87
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/cmd/bottle.rb
View File

@ -366,12 +366,14 @@ module Homebrew
update_or_add = "update" update_or_add = "update"
if ARGV.include? "--keep-old" if ARGV.include? "--keep-old"
mismatches = [] mismatches = []
s =~ / bottle do(.+?)end\n/m bottle_block_contents = s[/ bottle do(.+?)end\n/m, 1]
bottle_block_contents = $1
bottle_block_contents.lines.each do |line| bottle_block_contents.lines.each do |line|
line = line.strip line = line.strip
next if line.empty? next if line.empty?
key, value, _, tag = line.split " ", 4 key, value, _, tag = line.split " ", 4
valid_key = %w[root_url prefix cellar revision sha1 sha256].include? key
next unless valid_key
value = value.to_s.delete ":'\"" value = value.to_s.delete ":'\""
tag = tag.to_s.delete ":" tag = tag.to_s.delete ":"
@ -397,7 +399,9 @@ module Homebrew
string = s.sub!(/ bottle do.+?end\n/m, output) string = s.sub!(/ bottle do.+?end\n/m, output)
odie "Bottle block update failed!" unless string odie "Bottle block update failed!" unless string
else else
odie "--keep-old was passed but there was no existing bottle block!" if ARGV.include? "--keep-old"
odie "--keep-old was passed but there was no existing bottle block!"
end
puts output puts output
update_or_add = "add" update_or_add = "add"
if s.include? "stable do" if s.include? "stable do"