aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/googlecl.rb2
-rw-r--r--Library/Formula/osxutils.rb1
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'