diff options
| author | Xu Cheng | 2015-06-04 21:41:07 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-06-07 23:51:15 +0800 |
| commit | 036b9f691340001dc72f5ffc75982525217c3008 (patch) | |
| tree | c662d5e9d321a555fcef92e9fc884f2318d03b74 | |
| parent | 321d5e5c085de19e5a74182377dc3e2a60e05520 (diff) | |
| download | brew-036b9f691340001dc72f5ffc75982525217c3008.tar.bz2 | |
cleanup: use bottle_resolve_version
Closes Homebrew/homebrew#40378.
Signed-off-by: Xu Cheng <xucheng@me.com>
| -rw-r--r-- | Library/Homebrew/cmd/cleanup.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/cleanup.rb b/Library/Homebrew/cmd/cleanup.rb index 7c29369c7..a678a417a 100644 --- a/Library/Homebrew/cmd/cleanup.rb +++ b/Library/Homebrew/cmd/cleanup.rb @@ -69,7 +69,12 @@ module Homebrew HOMEBREW_CACHE.children.select(&:file?).each do |file| next cleanup_path(file) { file.unlink } if prune && file.mtime < time - next unless (version = file.version) + if Pathname::BOTTLE_EXTNAME_RX === file.to_s + version = bottle_resolve_version(file) rescue file.version + else + version = file.version + end + next unless version next unless (name = file.basename.to_s[/(.*)-(?:#{Regexp.escape(version)})/, 1]) begin |