🔨 Fix sorting on APFS.

This commit is contained in:
Markus Reiter 2017-06-20 15:27:16 +02:00
parent a1e5077adf
commit 19cf6dcb3f
3 changed files with 4 additions and 4 deletions

View File

@ -28,7 +28,7 @@ module Homebrew
unless (rack/version).directory? unless (rack/version).directory?
onoe "#{name} does not have a version \"#{version}\" in the Cellar." onoe "#{name} does not have a version \"#{version}\" in the Cellar."
versions = rack.subdirs.map { |d| Keg.new(d).version } versions = rack.subdirs.map { |d| Keg.new(d).version }.sort
puts "Versions available: #{versions.join(", ")}" puts "Versions available: #{versions.join(", ")}"
exit 3 exit 3

View File

@ -602,7 +602,7 @@ class Formula
# All currently installed prefix directories. # All currently installed prefix directories.
# @private # @private
def installed_prefixes def installed_prefixes
rack.directory? ? rack.subdirs : [] rack.directory? ? rack.subdirs.sort : []
end end
# All currently installed kegs. # All currently installed kegs.
@ -1182,7 +1182,7 @@ class Formula
return false unless old_rack.directory? return false unless old_rack.directory?
return false if old_rack.subdirs.empty? return false if old_rack.subdirs.empty?
tap == Tab.for_keg(old_rack.subdirs.first).tap tap == Tab.for_keg(old_rack.subdirs.sort.first).tap
end end
# @private # @private

View File

@ -9,7 +9,7 @@ describe FormulaPin do
formula.rack.mkpath formula.rack.mkpath
allow(formula).to receive(:installed_prefixes) do allow(formula).to receive(:installed_prefixes) do
formula.rack.directory? ? formula.rack.subdirs : [] formula.rack.directory? ? formula.rack.subdirs.sort : []
end end
allow(formula).to receive(:installed_kegs) do allow(formula).to receive(:installed_kegs) do