aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dependency.rb
diff options
context:
space:
mode:
authorJack Nagel2014-02-27 14:22:42 -0600
committerJack Nagel2014-02-27 14:22:42 -0600
commit96df4fe1da62efe9be9f1a9b5d885672c8f09d75 (patch)
treefc3513603c2a7c01c46f1651f37e7ab6c487abe5 /Library/Homebrew/dependency.rb
parente9b687070a50c6b3e83ad68013ad002723d96158 (diff)
downloadbrew-96df4fe1da62efe9be9f1a9b5d885672c8f09d75.tar.bz2
Apply cyclic dependency hack unconditionally
Diffstat (limited to 'Library/Homebrew/dependency.rb')
-rw-r--r--Library/Homebrew/dependency.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb
index 1a2b60a18..8ddeb90fd 100644
--- a/Library/Homebrew/dependency.rb
+++ b/Library/Homebrew/dependency.rb
@@ -75,6 +75,9 @@ class Dependency
expanded_deps = []
deps.each do |dep|
+ # FIXME don't hide cyclic dependencies
+ next if dependent.name == dep.name
+
case action(dependent, dep, &block)
when :prune
next
@@ -83,7 +86,6 @@ class Dependency
when :keep_but_prune_recursive_deps
expanded_deps << dep
else
- next if dependent.to_s == dep.name
expanded_deps.concat(expand(dep.to_formula, &block))
expanded_deps << dep
end