Skip to content

[Auditbeat] Cherry-pick #10507 to 6.x: Read formula path from INSTALL_RECEIPT.json for Homebrew packages#10559

Merged
cwurm merged 1 commit intoelastic:6.xfrom
cwurm:backport_10507_6.x
Feb 5, 2019
Merged

[Auditbeat] Cherry-pick #10507 to 6.x: Read formula path from INSTALL_RECEIPT.json for Homebrew packages#10559
cwurm merged 1 commit intoelastic:6.xfrom
cwurm:backport_10507_6.x

Conversation

@cwurm
Copy link
Copy Markdown
Contributor

@cwurm cwurm commented Feb 5, 2019

Cherry-pick of PR #10507 to 6.x branch. Original message:

When reading Homebrew packages, changes to reading the path to the Ruby formula from /usr/local/Cellar/{pkg.Name}/{pkg.Version}/INSTALL_RECEIPT.json and fall back to the previous /usr/local/Cellar/{pkg.Name}/{pkg.Version}/.brew/{pkg.Name}.rb only if that does not work.

On my Mac this read the whole 99 packages and their versions (confirmed with find /usr/local/Cellar -type d -depth 2 | wc -l), where the previous logic read only 92.

…packages (elastic#10507)

When reading Homebrew packages, changes to reading the path to the Ruby formula from `/usr/local/Cellar/{pkg.Name}/{pkg.Version}/INSTALL_RECEIPT.json` and fall back to the previous `/usr/local/Cellar/{pkg.Name}/{pkg.Version}/.brew/{pkg.Name}.rb` only if that does not work.

(cherry picked from commit 912ef57)
@cwurm cwurm changed the title Cherry-pick #10507 to 6.x: [Auditbeat] Read formula path from INSTALL_RECEIPT.json for Homebrew packages [Auditbeat] Cherry-pick #10507 to 6.x: Read formula path from INSTALL_RECEIPT.json for Homebrew packages Feb 5, 2019
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/secops

@cwurm cwurm requested a review from a team February 5, 2019 09:35
Copy link
Copy Markdown
Contributor

@tsg tsg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backport looks ok.

@cwurm cwurm merged commit 1118fa8 into elastic:6.x Feb 5, 2019
@cwurm cwurm deleted the backport_10507_6.x branch February 5, 2019 11:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants