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

bottle: merging problem when head conatins commas

Browse Source 
If `head` sections contains commas (e.g. `url "https://github.com/tarantool/tarantool.git", :branch => "1.6", :shallow => false`)
then re thinks that it reached the end and inserts `bottle do <-> end`
block before it, that leads to problems in ` brew audit --devel tarantool --strict --online`:

```
==> audit problems
tarantool:
 * `head` (line 11) should be put before `bottle block` (line 7)
```

It blocks Homebrew/homebrew#47495

Closes Homebrew/homebrew#47931.

Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>
This commit is contained in:
bigbes 2016-01-11 00:26:48 +07:00 committed by Dominyk Tiller
parent 6c380f0e85
commit 5e25b08fe4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,15 +371,15 @@ module Homebrew
else else
string = s.sub!( string = s.sub!(
/( /(
\ {2}( # two spaces at the beginning \ {2}( # two spaces at the beginning
url\ ['"][\S\ ]+['"] # url with a string (url|head)\ ['"][\S\ ]+['"] # url or head with a string
( (
,[\S\ ]*$ # url may have options ,[\S\ ]*$ # url may have options
(\n^\ {3}[\S\ ]+$)* # options can be in multiple lines (\n^\ {3}[\S\ ]+$)* # options can be in multiple lines
)?| )?|
(homepage|desc|sha1|sha256|head|version|mirror)\ ['"][\S\ ]+['"]| # specs with a string (homepage|desc|sha1|sha256|version|mirror)\ ['"][\S\ ]+['"]| # specs with a string
revision\ \d+ # revision with a number revision\ \d+ # revision with a number
)\n+ # multiple empty lines )\n+ # multiple empty lines
)+ )+
/mx, '\0' + output + "\n") /mx, '\0' + output + "\n")
end end