aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXu Cheng2015-06-16 19:16:44 +0800
committerJack Nagel2015-06-16 19:06:52 -0400
commitd9b1fec14fa01b1a35df8b4f09d4d6189d7ad47e (patch)
treeb43cc587c236d85c13fbb6673e7697f7ae29cad6
parent3f9a00dd58da9354f162069bdd2e1e87e5113483 (diff)
downloadbrew-d9b1fec14fa01b1a35df8b4f09d4d6189d7ad47e.tar.bz2
doctor: fix __check_linked_brew
This fixes the case when multiple versions of a formula are installed. Closes Homebrew/homebrew#40777. Fixes Homebrew/homebrew#40781. Fixes Homebrew/homebrew#40797. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
-rw-r--r--Library/Homebrew/cmd/doctor.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 2be9f18e0..b66f3c878 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -913,12 +913,12 @@ def check_for_autoconf
end
def __check_linked_brew f
- prefix = f.prefix
-
- prefix.find do |src|
- next if src == prefix
- dst = HOMEBREW_PREFIX + src.relative_path_from(prefix)
- return true if dst.symlink? && src == dst.resolved_path
+ f.rack.subdirs.each do |prefix|
+ prefix.find do |src|
+ next if src == prefix
+ dst = HOMEBREW_PREFIX + src.relative_path_from(prefix)
+ return true if dst.symlink? && src == dst.resolved_path
+ end
end
false