From 036b9f691340001dc72f5ffc75982525217c3008 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Thu, 4 Jun 2015 21:41:07 +0800 Subject: [PATCH] cleanup: use bottle_resolve_version Closes Homebrew/homebrew#40378. Signed-off-by: Xu Cheng --- Library/Homebrew/cmd/cleanup.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/cleanup.rb b/Library/Homebrew/cmd/cleanup.rb index 7c29369c7d..a678a417ac 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