From 7266ecd4e3799006d0482708a3331bfac4e1e0d1 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Wed, 15 Oct 2014 00:52:57 -0500
Subject: Hide install receipt key names

---
 Library/Homebrew/cmd/reinstall.rb | 3 +--
 Library/Homebrew/cmd/upgrade.rb   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'Library/Homebrew/cmd')

diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index 113607236..b72fbad09 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -20,8 +20,7 @@ module Homebrew
 
     fi = FormulaInstaller.new(f)
     fi.options             = options
-    fi.build_bottle        = ARGV.build_bottle?
-    fi.build_bottle      ||= tab.built_as_bottle && !tab.poured_from_bottle
+    fi.build_bottle        = ARGV.build_bottle? || tab.build_bottle?
     fi.build_from_source   = ARGV.build_from_source?
     fi.force_bottle        = ARGV.force_bottle?
     fi.verbose             = ARGV.verbose?
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 8f1b7fabe..c5b875d31 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -53,8 +53,7 @@ module Homebrew
 
     fi = FormulaInstaller.new(f)
     fi.options             = tab.used_options
-    fi.build_bottle        = ARGV.build_bottle?
-    fi.build_bottle      ||= tab.built_as_bottle && !tab.poured_from_bottle
+    fi.build_bottle        = ARGV.build_bottle? || tab.build_bottle?
     fi.build_from_source   = ARGV.build_from_source?
     fi.verbose             = ARGV.verbose?
     fi.verbose           &&= :quieter if ARGV.quieter?
-- 
cgit v1.2.3