aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/os
diff options
context:
space:
mode:
authorMike McQuaid2017-09-25 21:29:03 +0100
committerGitHub2017-09-25 21:29:03 +0100
commita5893036166b9708d705a5060aa85002d5a6be16 (patch)
tree03a254a34d12926540a0be677ffc8c9b9f32d5d0 /Library/Homebrew/os
parentac8b58537fe3dd71098a43afcc6a1785dcde1d39 (diff)
parentcf5fdeef1d8e9fd053121145882835b87eec2a43 (diff)
downloadbrew-a5893036166b9708d705a5060aa85002d5a6be16.tar.bz2
Merge pull request #3183 from MikeMcQuaid/rubocop-upgrade
Rubocop: 0.50.0 and Ruby 2.3
Diffstat (limited to 'Library/Homebrew/os')
-rw-r--r--Library/Homebrew/os/mac.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 52fa2a187..15c301f99 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -11,7 +11,7 @@ module OS
module Mac
module_function
- ::MacOS = self # rubocop:disable Style/ConstantName
+ ::MacOS = self # rubocop:disable Naming/ConstantName
raise "Loaded OS::Mac on generic OS!" if ENV["HOMEBREW_TEST_GENERIC_OS"]
@@ -104,7 +104,7 @@ module OS
# Returns the path to an SDK or nil, following the rules set by #sdk.
def sdk_path(v = nil)
s = sdk(v)
- s.path unless s.nil?
+ s&.path
end
# See these issues for some history: