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

Merge pull request #4614 from reitermarkus/fix-cleanup

Browse Source 
Fix cleanup for files with `--`.
This commit is contained in:
Markus Reiter 2018-08-06 17:13:49 +02:00 committed by GitHub
commit 54a9f687df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cleanup.rb
View File

@ -83,7 +83,7 @@ module Homebrew
version = file.version
end
next unless version
next unless (name = file.basename.to_s[/(.*)-(?:#{Regexp.escape(version)})/, 1])
next unless (name = file.basename.to_s[/\A(.*?)\-\-?(?:#{Regexp.escape(version)})/, 1])
next unless HOMEBREW_CELLAR.directory?

4
Library/Homebrew/test/cleanup_spec.rb
View File

@ -226,8 +226,8 @@ describe Homebrew::Cleanup do
end
context "cleans old files in HOMEBREW_CACHE" do
let(:bottle) { (HOMEBREW_CACHE/"testball-0.0.1.bottle.tar.gz") }
let(:testball) { (HOMEBREW_CACHE/"testball-0.0.1") }
let(:bottle) { (HOMEBREW_CACHE/"testball--0.0.1.bottle.tar.gz") }
let(:testball) { (HOMEBREW_CACHE/"testball--0.0.1") }
before do
FileUtils.touch(bottle)