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

Don’t treat .7z as part of a version.

Browse Source
This commit is contained in:
Markus Reiter 2018-09-29 10:32:18 +02:00
parent dae47914ca
commit c430baaee8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/extend/pathname.rb
View File

@ -200,7 +200,7 @@ class Pathname
return archive_ext if archive_ext return archive_ext if archive_ext
# Don't treat version numbers as extname. # Don't treat version numbers as extname.
return "" if basename.match?(/\b\d+\.\d+[^\.]*\Z/) return "" if basename.match?(/\b\d+\.\d+[^\.]*\Z/) && !basename.end_with?(".7z")
File.extname(basename) File.extname(basename)
end end

5
Library/Homebrew/test/pathname_spec.rb
View File

@ -137,6 +137,11 @@ describe Pathname do
it "does not treat version numbers as extensions" do it "does not treat version numbers as extensions" do
expect(described_class.new("foo-0.1").extname).to eq("") expect(described_class.new("foo-0.1").extname).to eq("")
expect(described_class.new("foo-1.0-rc1").extname).to eq("") expect(described_class.new("foo-1.0-rc1").extname).to eq("")
expect(described_class.new("foo-1.2.3").extname).to eq ""
end
it "supports `.7z` with version numbers" do
expect(described_class.new("snap7-full-1.4.2.7z").extname).to eq ".7z"
end end
end end