From c327fdafa9d20434fd3000f5968fb405794c590d Mon Sep 17 00:00:00 2001 From: Ian Lancaster Date: Mon, 13 Apr 2015 12:57:03 -0400 Subject: [PATCH] bottle: discard bottle revision from prior pkg_version Closes Homebrew/homebrew#38628. Signed-off-by: Xu Cheng --- Library/Homebrew/cmd/bottle.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 713c8ca40c..8d52296531 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -130,8 +130,9 @@ module Homebrew else ohai "Determining #{f.name} bottle revision..." versions = FormulaVersions.new(f) - max = versions.bottle_version_map("origin/master")[f.pkg_version].max - bottle_revision = max ? max + 1 : 0 + bottle_revisions = versions.bottle_version_map("origin/master")[f.pkg_version] + bottle_revisions.pop if bottle_revisions.last > 0 + bottle_revision = bottle_revisions.any? ? bottle_revisions.max + 1 : 0 end filename = Bottle::Filename.create(f, bottle_tag, bottle_revision)