diff options
| author | Jason Whittle | 2013-12-16 10:20:41 -0500 |
|---|---|---|
| committer | Adam Vandenberg | 2013-12-16 20:25:18 -0800 |
| commit | ec55b11582e230b735c3c1938261677696219a7e (patch) | |
| tree | 4398c90d2c15cd397157983d0f88cfd859fa65e4 /Library/Formula | |
| parent | a2f814bf218e8193b3676b9a13a006d2b0ed1a76 (diff) | |
| download | homebrew-ec55b11582e230b735c3c1938261677696219a7e.tar.bz2 | |
googlecl and osxutils conflict
Closes #25258.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/googlecl.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/osxutils.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Library/Formula/googlecl.rb b/Library/Formula/googlecl.rb index d133d2839..c578482ef 100644 --- a/Library/Formula/googlecl.rb +++ b/Library/Formula/googlecl.rb @@ -7,6 +7,8 @@ class Googlecl < Formula depends_on :python + conflicts_with 'osxutils', :because => 'both install a google binary' + # TODO: Move this into Library/Homebrew somewhere (see also ansible.rb). def wrap bin_file, pythonpath bin_file = Pathname.new bin_file diff --git a/Library/Formula/osxutils.rb b/Library/Formula/osxutils.rb index b86fbf06a..0bfe07127 100644 --- a/Library/Formula/osxutils.rb +++ b/Library/Formula/osxutils.rb @@ -9,6 +9,7 @@ class Osxutils < Formula conflicts_with 'trash', :because => 'both install a trash binary' conflicts_with 'leptonica', :because => "both leptonica and osxutils ship a `fileinfo` executable." + conflicts_with 'googlecl', :because => 'both install a google binary' def install system 'make' |