aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Shablinsky2016-08-06 16:21:25 +0300
committerXu Cheng2016-08-06 21:25:56 +0800
commit001bef0604534adeb5f85d77e00a20e8a1542b7a (patch)
tree72611646872045ea6ec975a5e2ca1be6556a9322
parenta59bdc4a2a429bbe5fb812bd4ca98cd437a319be (diff)
downloadbrew-001bef0604534adeb5f85d77e00a20e8a1542b7a.tar.bz2
formula: detect outdated HEAD in outdated_versions
-rw-r--r--Library/Homebrew/formula.rb16
1 files changed, 11 insertions, 5 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index d3a608718..d7d2f16fc 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1000,7 +1000,7 @@ class Formula
end
# @private
- def outdated_versions
+ def outdated_versions(options = {})
@outdated_versions ||= begin
all_versions = []
@@ -1009,16 +1009,22 @@ class Formula
installed_kegs.each do |keg|
version = keg.version
all_versions << version
- return [] if pkg_version <= version
+
+ return [] if pkg_version <= version && !version.head?
end
- all_versions.sort!
+ head_version = latest_head_version
+ if head_version
+ head_version_outdated?(head_version, options) ? all_versions.sort! : []
+ else
+ all_versions.sort!
+ end
end
end
# @private
- def outdated?
- !outdated_versions.empty?
+ def outdated?(options = {})
+ !outdated_versions(options).empty?
rescue Migrator::MigrationNeededError
true
end