diff options
| author | Mike McQuaid | 2014-12-30 10:35:24 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2014-12-30 10:35:24 +0000 |
| commit | c0429f60f6dd5b2bf536d79277087d599d075813 (patch) | |
| tree | da4f287343591fed3070d873b0ff1518ad765635 /Library/Formula | |
| parent | 0eef4301dd65676b1de92c229f3581a0c58cf332 (diff) | |
| download | homebrew-c0429f60f6dd5b2bf536d79277087d599d075813.tar.bz2 | |
fig, tutum: add conflicts_with.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/fig.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/tutum.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Library/Formula/fig.rb b/Library/Formula/fig.rb index 55144355e..686cf4048 100644 --- a/Library/Formula/fig.rb +++ b/Library/Formula/fig.rb @@ -15,6 +15,8 @@ class Fig < Formula depends_on :python if MacOS.version <= :snow_leopard depends_on "libyaml" + conflicts_with "tutum", :because => "both install `wsdump.py` binaries" + resource "docopt" do url "https://pypi.python.org/packages/source/d/docopt/docopt-0.6.1.tar.gz" sha1 "3d0ad1cf495d2c801327042e02d67b4ee4b85cd4" diff --git a/Library/Formula/tutum.rb b/Library/Formula/tutum.rb index 8770198b1..1cbf0f9bb 100644 --- a/Library/Formula/tutum.rb +++ b/Library/Formula/tutum.rb @@ -15,6 +15,8 @@ class Tutum < Formula depends_on :python if MacOS.version <= :snow_leopard depends_on "libyaml" + conflicts_with "fig", :because => "both install `wsdump.py` binaries" + resource "pyyaml" do url "https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz" sha1 "476dcfbcc6f4ebf3c06186229e8e2bd7d7b20e73" |