From ba48d8c5b99ecdf5c80f7656ba647907a22c9e58 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 27 Dec 2014 16:16:16 -0500 Subject: [PATCH] Use version attribute directly in cache comparisons The bug that prompted the two relevant commits has since been addressed. Squashed commit of the following: commit ecca17ede8324efd1175a42300ace8e1e2df30fa Author: Jack Nagel Date: Sat Dec 27 16:16:12 2014 -0500 Revert "Don't use pkg_version when cleaning the cache" This reverts commit 4d511b5169d78a5d44bbf6c36c17f0c28014a614. commit e8935de08f6440ae1874ce523f93b19da6b68df3 Author: Jack Nagel Date: Sat Dec 27 16:16:12 2014 -0500 Revert "Fix cleanup for head-only formulae" This reverts commit 510267ffd314c296c0b0969dd27d130a249f16e2. --- Library/Homebrew/cmd/cleanup.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/cleanup.rb b/Library/Homebrew/cmd/cleanup.rb index 17bca7febd..74437b0052 100644 --- a/Library/Homebrew/cmd/cleanup.rb +++ b/Library/Homebrew/cmd/cleanup.rb @@ -86,8 +86,7 @@ module Homebrew next end - spec = f.stable || f.devel || f.head - if spec.version > version || ARGV.switch?('s') && !f.installed? || bottle_file_outdated?(f, file) + if f.version > version || ARGV.switch?('s') && !f.installed? || bottle_file_outdated?(f, file) cleanup_cached_file(file) end end