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

Merge pull request #3553 from MikeMcQuaid/bump-formula-pr-messages

Browse Source 
bump-formula-pr: improve error messages.
This commit is contained in:
Mike McQuaid 2017-12-11 09:44:43 +00:00 committed by GitHub
commit 236e884511
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,9 +180,9 @@ module Homebrew
elsif new_tag && new_revision elsif new_tag && new_revision
false false
elsif !hash_type elsif !hash_type
odie "#{formula}: no tag/revision specified!" odie "#{formula}: no --tag=/--revision= arguments specified!"
elsif !new_url elsif !new_url
odie "#{formula}: no url specified!" odie "#{formula}: no --url= argument specified!"
else else
rsrc_url = if requested_spec != :devel && new_url =~ /.*ftpmirror.gnu.*/ rsrc_url = if requested_spec != :devel && new_url =~ /.*ftpmirror.gnu.*/
new_mirror = new_url.sub "ftpmirror.gnu.org", "ftp.gnu.org/gnu" new_mirror = new_url.sub "ftpmirror.gnu.org", "ftp.gnu.org/gnu"
@ -194,7 +194,7 @@ module Homebrew
rsrc.download_strategy = CurlDownloadStrategy rsrc.download_strategy = CurlDownloadStrategy
rsrc.owner = Resource.new(formula.name) rsrc.owner = Resource.new(formula.name)
rsrc.version = forced_version if forced_version rsrc.version = forced_version if forced_version
odie "No version specified!" unless rsrc.version odie "No --version= argument specified!" unless rsrc.version
rsrc_path = rsrc.fetch rsrc_path = rsrc.fetch
gnu_tar_gtar_path = HOMEBREW_PREFIX/"opt/gnu-tar/bin/gtar" gnu_tar_gtar_path = HOMEBREW_PREFIX/"opt/gnu-tar/bin/gtar"
gnu_tar_gtar = gnu_tar_gtar_path if gnu_tar_gtar_path.executable? gnu_tar_gtar = gnu_tar_gtar_path if gnu_tar_gtar_path.executable?
@ -202,7 +202,7 @@ module Homebrew
if Utils.popen_read(tar, "-tf", rsrc_path) =~ %r{/.*\.} if Utils.popen_read(tar, "-tf", rsrc_path) =~ %r{/.*\.}
new_hash = rsrc_path.sha256 new_hash = rsrc_path.sha256
elsif new_url.include? ".tar" elsif new_url.include? ".tar"
odie "#{formula}: no url/#{hash_type} specified!" odie "#{formula}: no --url=/--#{hash_type}= arguments specified!"
end end
end end
@ -338,7 +338,13 @@ module Homebrew
if reply.to_s.include? "username:" if reply.to_s.include? "username:"
formula.path.atomic_write(backup_file) unless ARGV.dry_run? formula.path.atomic_write(backup_file) unless ARGV.dry_run?
odie "Please authentify with hub (eg. by typing 'cd $(brew --repo) && hub issue') and try again." git_path = "$(brew --repo #{formula.tap})" if formula.tap
git_path ||= formula.path.parent
odie <<~EOS
Retry after configuring hub by running:
hub -C "#{git_path}" fork
Or setting HOMEBREW_GITHUB_TOKEN with at least 'public_repo' scope.
EOS
end end
remote = reply[/remote:? (\S+)/, 1] remote = reply[/remote:? (\S+)/, 1]