bottle_resolve_version: return PkgVersion

This commit is contained in:
Xu Cheng 2015-07-22 22:26:52 +08:00
parent 2751449abb
commit 602ea66a0f
2 changed files with 8 additions and 2 deletions

View File

@ -58,7 +58,7 @@ def bottle_resolve_formula_names bottle_file
end end
def bottle_resolve_version bottle_file def bottle_resolve_version bottle_file
Version.new bottle_receipt_path(bottle_file).split("/")[1] PkgVersion.parse bottle_receipt_path(bottle_file).split("/")[1]
end end
class Bintray class Bintray

View File

@ -83,7 +83,13 @@ module Homebrew
next next
end end
if f.version > version || ARGV.switch?('s') && !f.installed? || bottle_file_outdated?(f, file) file_is_stale = if PkgVersion === version
f.pkg_version > version
else
f.version > version
end
if file_is_stale || ARGV.switch?('s') && !f.installed? || bottle_file_outdated?(f, file)
cleanup_path(file) { file.unlink } cleanup_path(file) { file.unlink }
end end
end end