From 5e98d4df088128d32036bc2518db754714aa6f81 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Sat, 1 Aug 2020 17:36:16 +0100 Subject: [PATCH 1/3] cli/parser: restore env setting for global options --- Library/Homebrew/cli/parser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cli/parser.rb b/Library/Homebrew/cli/parser.rb index ba73c7449a..7d414e07d0 100644 --- a/Library/Homebrew/cli/parser.rb +++ b/Library/Homebrew/cli/parser.rb @@ -49,7 +49,7 @@ module Homebrew @formula_options = false self.class.global_options.each do |short, long, desc| - switch short, long, description: desc + switch short, long, description: desc, env: option_to_name(long) end instance_eval(&block) if block_given? From 20c6a3f325ceac8a2d1b2ec9f0605972fc4c8045 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Sat, 1 Aug 2020 17:37:02 +0100 Subject: [PATCH 2/3] build, test: fix debrew not working --- Library/Homebrew/build.rb | 2 +- Library/Homebrew/test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index 2313210c8a..3031765e65 100644 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -135,7 +135,7 @@ class Build } with_env(new_env) do - formula.extend(Debrew::Formula) if Homebrew.args.debug? + formula.extend(Debrew::Formula) if args.debug? formula.update_head_version diff --git a/Library/Homebrew/test.rb b/Library/Homebrew/test.rb index 233c323383..7167aabeb4 100644 --- a/Library/Homebrew/test.rb +++ b/Library/Homebrew/test.rb @@ -25,7 +25,7 @@ begin formula = args.resolved_formulae.first formula.extend(Homebrew::Assertions) formula.extend(Homebrew::FreePort) - formula.extend(Debrew::Formula) if Homebrew.args.debug? + formula.extend(Debrew::Formula) if args.debug? ENV.extend(Stdenv) ENV.setup_build_environment(formula: formula) From 7f46d4ec3c93a1a7ac2a592db634a8c43f01cef2 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Sat, 1 Aug 2020 17:37:11 +0100 Subject: [PATCH 3/3] build, test: set Homebrew.args --- Library/Homebrew/build.rb | 3 +++ Library/Homebrew/test.rb | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index 3031765e65..d0ec6dacf7 100644 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -208,7 +208,10 @@ class Build end begin + Homebrew.args = Homebrew::CLI::Parser.new.parse(ARGV.dup.freeze, ignore_invalid_options: true) + args = Homebrew.install_args.parse + error_pipe = UNIXSocket.open(ENV["HOMEBREW_ERROR_PIPE"], &:recv_io) error_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) diff --git a/Library/Homebrew/test.rb b/Library/Homebrew/test.rb index 7167aabeb4..2936c20715 100644 --- a/Library/Homebrew/test.rb +++ b/Library/Homebrew/test.rb @@ -16,6 +16,8 @@ require "dev-cmd/test" TEST_TIMEOUT_SECONDS = 5 * 60 begin + Homebrew.args = Homebrew::CLI::Parser.new.parse(ARGV.dup.freeze, ignore_invalid_options: true) + args = Homebrew.test_args.parse error_pipe = UNIXSocket.open(ENV["HOMEBREW_ERROR_PIPE"], &:recv_io) error_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)