aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2016-12-31 17:36:33 +0000
committerGitHub2016-12-31 17:36:33 +0000
commit9fa95d721820919eff3193c3c5bded37f6589831 (patch)
treeca355a8d36b7d2c438b65ccff0bfb72abc4b457d /Library
parent33fbf3f32d4fc0e4c119f070d5ef27c3470a5822 (diff)
parent82f441396422b44c5f293e2b6597163de2349733 (diff)
downloadbrew-9fa95d721820919eff3193c3c5bded37f6589831.tar.bz2
Merge pull request #1758 from MikeMcQuaid/no-duplicate-formulae
formula, ARGV: don't output duplicate formulae.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/extend/ARGV.rb4
-rw-r--r--Library/Homebrew/formula.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index d361a99a8..767ddc6e3 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -44,7 +44,7 @@ module HomebrewArgvExtension
else
Formulary.find_with_priority(name, spec)
end
- end
+ end.uniq(&:name)
end
def resolved_formulae
@@ -79,7 +79,7 @@ module HomebrewArgvExtension
f.follow_installed_alias = false
f
- end
+ end.uniq(&:name)
end
def casks
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index bc1dbd970..02d4b09a0 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1406,7 +1406,7 @@ class Formula
Formulary.from_rack(rack)
rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
end
- end.compact
+ end.compact.uniq(&:name)
end
def self.installed_with_alias_path(alias_path)