diff options
| author | Martin Afanasjew | 2015-10-23 00:07:12 +0200 |
|---|---|---|
| committer | Mike McQuaid | 2015-10-23 12:34:44 +0100 |
| commit | 30cad0608ff6c22051b5a1e0f3bf566d643bb673 (patch) | |
| tree | 7f513efa969e9dfd38d1f158cc2e968db6ab5902 /Library/Homebrew/cmd | |
| parent | 7c7b7bf97f2ed1a86b4a9edd12744e4d142949c4 (diff) | |
| download | brew-30cad0608ff6c22051b5a1e0f3bf566d643bb673.tar.bz2 | |
os: centralize check for pre-release OS X versions
Provide `OS::Mac.prerelease?` for pre-release checks and use it where
appropriate. This should simplify updating the test once a new OS X
release lands.
This also fixes a bug in `BuildError#dump`, where an empty warning
message was printed on El Capitan after a failed from-source build,
because the check there and the one in `check_for_unsupported_osx` were
out of sync.
Closes Homebrew/homebrew#45257.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index 302c436cd..686b0b98c 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -240,7 +240,7 @@ class Checks end def check_for_unsupported_osx - if !ARGV.homebrew_developer? && MacOS.version >= "10.12" then <<-EOS.undent + if !ARGV.homebrew_developer? && OS::Mac.prerelease? then <<-EOS.undent You are using OS X #{MacOS.version}. We do not provide support for this pre-release version. You may encounter build failures or other breakages. @@ -259,8 +259,7 @@ class Checks end end - # TODO: bump version when new OS is released - if MacOS.version >= "10.12" + if OS::Mac.prerelease? def check_xcode_up_to_date if MacOS::Xcode.installed? && MacOS::Xcode.outdated? <<-EOS.undent |