Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade: don't build bottles unnecessarily. #6066

Merged
merged 1 commit into from Apr 25, 2019
Merged

upgrade: don't build bottles unnecessarily. #6066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Library/Homebrew/cmd/upgrade.rb
View file
Open in desktop
Expand Up @@ -164,10 +164,11 @@ def upgrade_formula(f)

fi = FormulaInstaller.new(f)
fi.options = options
fi.build_bottle = args.build_bottle? || (!f.bottle_defined? && f.build.bottle?)
fi.build_bottle = args.build_bottle?
fi.installed_on_request = !ARGV.named.empty?
fi.link_keg ||= keg_was_linked if keg_had_linked_opt
if tab
fi.build_bottle ||= tab.built_bottle?
fi.installed_as_dependency = tab.installed_as_dependency
fi.installed_on_request ||= tab.installed_on_request
end
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/tab.rb
View file
Open in desktop
Expand Up @@ -280,7 +280,7 @@ def cxxstdlib
CxxStdlib.create(lib, compiler.to_sym)
end

def build_bottle?
def built_bottle?
built_as_bottle && !poured_from_bottle
end

Expand Down