admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

formula: use installed_prefixes/installed_kegs

Browse Source 
Closes Homebrew/homebrew#46463.
This commit is contained in:
Xu Cheng 2015-11-29 15:22:22 +08:00
parent 6273d464ee
commit 0686ebfcc0
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/formula.rb
View File

@ -391,7 +391,7 @@ class Formula
# @private # @private
def any_version_installed? def any_version_installed?
require "tab" require "tab"
rack.directory? && rack.subdirs.any? { |keg| (keg/Tab::FILENAME).file? } installed_prefixes.any? { |keg| (keg/Tab::FILENAME).file? }
end end
# @private # @private
@ -950,8 +950,7 @@ class Formula
raise Migrator::MigrationNeededError.new(self) raise Migrator::MigrationNeededError.new(self)
end end
rack.subdirs.each do |keg_dir| installed_kegs.each do |keg|
keg = Keg.new keg_dir
version = keg.version version = keg.version
all_versions << version all_versions << version
older_version = pkg_version <= version older_version = pkg_version <= version
@ -1297,10 +1296,8 @@ class Formula
hsh["bottle"][spec_sym] = bottle_info hsh["bottle"][spec_sym] = bottle_info
end end
if rack.directory? installed_kegs.each do |keg|
rack.subdirs.each do |keg_path| tab = Tab.for_keg keg
keg = Keg.new keg_path
tab = Tab.for_keg keg_path
hsh["installed"] << { hsh["installed"] << {
"version" => keg.version.to_s, "version" => keg.version.to_s,
@ -1311,7 +1308,6 @@ class Formula
end end
hsh["installed"] = hsh["installed"].sort_by { |i| Version.new(i["version"]) } hsh["installed"] = hsh["installed"].sort_by { |i| Version.new(i["version"]) }
end
hsh hsh
end end