Skip to content

ARGV: Deprecate ARGV.keep_tmp? #7173

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

Merged
MikeMcQuaid merged 1 commit into from
Mar 16, 2020
Merged

ARGV: Deprecate ARGV.keep_tmp? #7173

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Library/Homebrew/build.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def install
# which is not known until after the formula has been staged.
ENV["HOMEBREW_FORMULA_PREFIX"] = formula.prefix

staging.retain! if ARGV.keep_tmp?
staging.retain! if Homebrew.args.keep_tmp?
formula.patch

if Homebrew.args.git?
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/dev-cmd/update-test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,6 @@ def update_test
end
end
ensure
FileUtils.rm_rf "update-test" unless args.keep_tmp?
FileUtils.rm_rf "update-test" unless Homebrew.args.keep_tmp?
end
end
4 changes: 0 additions & 4 deletions Library/Homebrew/extend/ARGV.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ def debug?
flag?("--debug") || !ENV["HOMEBREW_DEBUG"].nil?
end

def keep_tmp?
include? "--keep-tmp"
end

def homebrew_developer?
!ENV["HOMEBREW_DEVELOPER"].nil?
end
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/formula.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@ def patch
def brew
@prefix_returns_versioned_prefix = true
stage do |staging|
staging.retain! if ARGV.keep_tmp?
staging.retain! if Homebrew.args.keep_tmp?
prepare_patches

begin
Expand Down Expand Up @@ -1765,7 +1765,7 @@ def run_test
Utils.set_git_name_email!

mktemp("#{name}-test") do |staging|
staging.retain! if ARGV.keep_tmp?
staging.retain! if Homebrew.args.keep_tmp?
@testpath = staging.tmpdir
test_env[:HOME] = @testpath
setup_home @testpath
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/formula_installer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ def sanitized_argv_options
args << "--debug" if debug?
args << "--cc=#{ARGV.cc}" if ARGV.cc
args << "--default-fortran-flags" if ARGV.include? "--default-fortran-flags"
args << "--keep-tmp" if ARGV.keep_tmp?
args << "--keep-tmp" if Homebrew.args.keep_tmp?

if ARGV.env
args << "--env=#{ARGV.env}"
Expand Down