admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Switch from formula.tap.full_name to tap_formula_name

Browse Source
This commit is contained in:
Maxim Belkin 2019-11-19 13:43:51 -06:00
parent 845f65b945
commit a031fe911e
No known key found for this signature in database
GPG Key ID: AC71560D4C5F2338
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -341,7 +341,7 @@ module Homebrew
remote_url = Utils.popen_read("git remote get-url --push origin").chomp remote_url = Utils.popen_read("git remote get-url --push origin").chomp
username = formula.tap.user username = formula.tap.user
else else
remote_url, username = forked_repo_info(formula) remote_url, username = forked_repo_info(tap_full_name)
end end
safe_system "git", "fetch", "--unshallow", "origin" if shallow safe_system "git", "fetch", "--unshallow", "origin" if shallow
@ -380,14 +380,14 @@ module Homebrew
end end
end end
def forked_repo_info(formula) def forked_repo_info(tap_full_name)
response = GitHub.create_fork(formula.tap.full_name) response = GitHub.create_fork(tap_full_name)
rescue GitHub::AuthenticationFailedError, *GitHub.api_errors => e rescue GitHub::AuthenticationFailedError, *GitHub.api_errors => e
formula.path.atomic_write(backup_file) unless args.dry_run? formula.path.atomic_write(backup_file) unless args.dry_run?
odie "Unable to fork: #{e.message}!" odie "Unable to fork: #{e.message}!"
else else
# GitHub API responds immediately but fork takes a few seconds to be ready. # GitHub API responds immediately but fork takes a few seconds to be ready.
sleep 1 until GitHub.check_fork_exists(formula.tap.full_name) sleep 1 until GitHub.check_fork_exists(tap_full_name)
if system("git", "config", "--local", "--get-regexp", "remote\..*\.url", "git@github.com:.*") if system("git", "config", "--local", "--get-regexp", "remote\..*\.url", "git@github.com:.*")
remote_url = response.fetch("ssh_url") remote_url = response.fetch("ssh_url")
else else