aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2014-01-04 13:18:27 +0000
committerMike McQuaid2014-01-04 13:19:20 +0000
commit744a8944b0e79a79b0801616d2a6f339be0c8cca (patch)
tree0633cf3674bc5a31d8a3f0afe4fcf6822327d6b9 /Library
parentcdbc7c9e53dccc17e65bb6f7f7a95a34dadf3b58 (diff)
downloadbrew-744a8944b0e79a79b0801616d2a6f339be0c8cca.tar.bz2
caveats: show python caveats if modules installed.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/caveats.rb18
-rw-r--r--Library/Homebrew/keg.rb4
2 files changed, 21 insertions, 1 deletions
diff --git a/Library/Homebrew/caveats.rb b/Library/Homebrew/caveats.rb
index 466d0b0b5..db95fe86e 100644
--- a/Library/Homebrew/caveats.rb
+++ b/Library/Homebrew/caveats.rb
@@ -7,11 +7,12 @@ class Caveats
def caveats
caveats = []
- caveats << f.caveats
+ caveats << f.caveats if f.caveats.to_s.length > 0
caveats << f.keg_only_text if f.keg_only? && f.respond_to?(:keg_only_text)
caveats << bash_completion_caveats
caveats << zsh_completion_caveats
caveats << plist_caveats
+ caveats << python_caveats
caveats.compact.join("\n")
end
@@ -43,6 +44,21 @@ class Caveats
end
end
+ def python_caveats
+ site_packages = if f.keg_only?
+ "#{f.opt_prefix}/lib/python2.7/site-packages"
+ else
+ "#{HOMEBREW_PREFIX}/lib/python2.7/site-packages"
+ end
+ if keg and keg.python_site_packages_installed? \
+ and !ENV['PYTHONPATH'].to_s.include? site_packages
+ <<-EOS.undent
+ Set PYTHONPATH if you want Python to find your site-packages:
+ export PYTHONPATH=#{site_packages}:$PYTHONPATH
+ EOS
+ end
+ end
+
def plist_caveats
s = []
if f.plist or (keg and keg.plist_installed?)
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index e1178d5dd..8ad5ffaea 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -92,6 +92,10 @@ class Keg < Pathname
end
end
+ def python_site_packages_installed?
+ (self/'lib/python2.7/site-packages').directory?
+ end
+
def version
require 'version'
Version.new(basename.to_s)