diff options
| author | Mike McQuaid | 2015-02-10 11:23:58 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2015-02-11 14:22:48 +0000 |
| commit | 988ec8de98aad75adea20da0f887b0c8b5fad671 (patch) | |
| tree | 7b1ef67ee9a44f6c00476d4dd8ab512cfd8aa772 /Library/Homebrew/cmd/outdated.rb | |
| parent | 2320c0a6c1130dd24d7f73c073c66ad798caa8b0 (diff) | |
| download | brew-988ec8de98aad75adea20da0f887b0c8b5fad671.tar.bz2 | |
outdated: handle fully qualified tapped formulae.
Previously if I did `brew install boxen/brews/imagemagick` and then `brew
upgrade boxen/brews/imagemagick` and the version of `imagemagick` in
`boxen/brews` was older than the version in `Homebrew/homebrew` then it would
install the correct version from the `boxen/brews` tap and then try to
immediately upgrade it to the version from `Homebrew/homebrew`. I'd argue
fairly strongly that this behaviour is pretty unintuitive; when you fully
specify a formula from a tap then it should be prioritised by `brew upgrade`
and `brew outdated.
This commit makes `brew upgrade boxen/brews/imagemagick` only upgrade the
version of `imagemagick` if the version in the `boxen/brews` tap is newer.
Similarly `brew outdated imagemagick` and `brew outdated
boxen/brews/imagemagick` will show different results if the newer version
differs between `boxen/brews` and `Homebrew/homebrew`.
Closes Homebrew/homebrew#36699.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew/cmd/outdated.rb')
| -rw-r--r-- | Library/Homebrew/cmd/outdated.rb | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/outdated.rb b/Library/Homebrew/cmd/outdated.rb index 01805809e..dd1b4635b 100644 --- a/Library/Homebrew/cmd/outdated.rb +++ b/Library/Homebrew/cmd/outdated.rb @@ -17,9 +17,21 @@ module Homebrew def outdated_brews(formulae) formulae.map do |f| - versions = f.rack.subdirs.map { |d| Keg.new(d).version }.sort! - if versions.all? { |version| f.pkg_version > version } - yield f, versions if block_given? + all_versions = [] + same_tap_versions = [] + f.rack.subdirs.each do |dir| + keg = Keg.new dir + version = keg.version + all_versions << version + + tap = Tab.for_keg(keg).tapped_from + if f.tap == tap || f.version == version + same_tap_versions << version + end + end + + if same_tap_versions.all? { |version| f.pkg_version > version } + yield f, all_versions if block_given? f end end.compact |
