Merge pull request #3430 from commitay/hash-order

brew list 'filtered_list': pass explicit sort to handle APFS
This commit is contained in:
Mike McQuaid 2017-11-07 08:03:48 +00:00 committed by GitHub
commit b96ded7ca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -108,7 +108,7 @@ module Homebrew
end end
if ARGV.include? "--pinned" if ARGV.include? "--pinned"
pinned_versions = {} pinned_versions = {}
names.each do |d| names.sort.each do |d|
keg_pin = (HOMEBREW_PINNED_KEGS/d.basename.to_s) keg_pin = (HOMEBREW_PINNED_KEGS/d.basename.to_s)
if keg_pin.exist? || keg_pin.symlink? if keg_pin.exist? || keg_pin.symlink?
pinned_versions[d] = keg_pin.readlink.basename.to_s pinned_versions[d] = keg_pin.readlink.basename.to_s
@ -118,7 +118,7 @@ module Homebrew
puts d.basename.to_s.concat(ARGV.include?("--versions") ? " #{version}" : "") puts d.basename.to_s.concat(ARGV.include?("--versions") ? " #{version}" : "")
end end
else # --versions without --pinned else # --versions without --pinned
names.each do |d| names.sort.each do |d|
versions = d.subdirs.map { |pn| pn.basename.to_s } versions = d.subdirs.map { |pn| pn.basename.to_s }
next if ARGV.include?("--multiple") && versions.length < 2 next if ARGV.include?("--multiple") && versions.length < 2
puts "#{d.basename} #{versions * " "}" puts "#{d.basename} #{versions * " "}"