From 2b990aa53c12d873ad2513e7168268c28ca234cf Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Mon, 22 Jun 2020 00:21:22 +1000 Subject: [PATCH] pr-pull: pass verbose and debug to subcommands --- Library/Homebrew/dev-cmd/pr-pull.rb | 4 ++++ Library/Homebrew/dev-cmd/pr-upload.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb index 3eb58d2e61..bbd1b097e4 100644 --- a/Library/Homebrew/dev-cmd/pr-pull.rb +++ b/Library/Homebrew/dev-cmd/pr-pull.rb @@ -147,6 +147,8 @@ module Homebrew else odebug "Mirroring #{mirror_url}" mirror_args = ["mirror", f.full_name] + mirror_args << "--debug" if Homebrew.args.debug? + mirror_args << "--verbose" if Homebrew.args.verbose? mirror_args << "--bintray-org=#{org}" if org mirror_args << "--bintray-repo=#{repo}" if repo mirror_args << "--no-publish" unless publish @@ -247,6 +249,8 @@ module Homebrew next if args.no_upload? upload_args = ["pr-upload"] + upload_args << "--debug" if Homebrew.args.debug? + upload_args << "--verbose" if Homebrew.args.verbose? upload_args << "--no-publish" if args.no_publish? upload_args << "--dry-run" if args.dry_run? upload_args << "--root_url=#{args.root_url}" if args.root_url diff --git a/Library/Homebrew/dev-cmd/pr-upload.rb b/Library/Homebrew/dev-cmd/pr-upload.rb index 36382b9908..86b1d83717 100644 --- a/Library/Homebrew/dev-cmd/pr-upload.rb +++ b/Library/Homebrew/dev-cmd/pr-upload.rb @@ -21,6 +21,8 @@ module Homebrew description: "Upload to the specified Bintray organisation (default: homebrew)." flag "--root-url=", description: "Use the specified as the root of the bottle's URL instead of Homebrew's default." + switch :verbose + switch :debug end end @@ -31,6 +33,8 @@ module Homebrew bintray = Bintray.new(org: bintray_org) bottle_args = ["bottle", "--merge", "--write"] + bottle_args << "--verbose" if args.verbose? + bottle_args << "--debug" if args.debug? bottle_args << "--root-url=#{args.root_url}" if args.root_url odie "No JSON files found in the current working directory" if Dir["*.json"].empty? bottle_args += Dir["*.json"]