diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/caveats.rb | 18 | ||||
| -rw-r--r-- | Library/Homebrew/keg.rb | 4 |
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) |