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

Merge pull request #4658 from reitermarkus/ignore-version-error

Browse Source 
Set `initial_version` to `nil` when `git describe` fails.
This commit is contained in:
Markus Reiter 2018-08-11 17:45:45 +02:00 committed by GitHub
commit 17fda8d546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cmd/update-report.rb
View File

@ -62,10 +62,12 @@ module Homebrew
updated = true updated = true
end end
initial_version = Version.new(system_command!("git", out, _, status = system_command("git",
args: ["describe", "--tags", "--abbrev=0", initial_revision], args: ["describe", "--tags", "--abbrev=0", initial_revision],
chdir: HOMEBREW_REPOSITORY, chdir: HOMEBREW_REPOSITORY,
print_stderr: false).stdout) print_stderr: false)
initial_version = Version.new(out) if status.success?
updated_taps = [] updated_taps = []
Tap.each do |tap| Tap.each do |tap|
@ -186,7 +188,7 @@ module Homebrew
end end
def migrate_cache_entries_to_double_dashes(initial_version) def migrate_cache_entries_to_double_dashes(initial_version)
return if initial_version > "1.7.1" return if initial_version && initial_version > "1.7.1"
return if ENV.key?("HOMEBREW_DISABLE_LOAD_FORMULA") return if ENV.key?("HOMEBREW_DISABLE_LOAD_FORMULA")