diff options
| author | Tim Smith <tsmith@chef.io> | 2021-03-06 19:55:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-06 19:55:48 -0800 |
| commit | 60d1e07077336cc6bc073a860c05bb03ae6831d7 (patch) | |
| tree | d38606ccd538db6db1a92d9649810e6f84c3fc8c | |
| parent | 2397af29ecc3c3e849d817a8519d32866aab89ff (diff) | |
| parent | 214863ba7d442e0bd98d58918c5ec06f98df484f (diff) | |
| download | ohai-60d1e07077336cc6bc073a860c05bb03ae6831d7.tar.gz | |
Merge pull request #1630 from chef/rubocop_perf
Update rubocop-performance to 1.10.1 and revert optimization
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | lib/ohai/plugins/network.rb | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -16,7 +16,7 @@ group :development do gem "rspec-core", "~> 3.0" gem "rspec-expectations", "~> 3.0" gem "rspec-mocks", "~> 3.0" - gem "rubocop-performance", "1.10.0" + gem "rubocop-performance", "1.10.1" gem "rubocop-rspec" end diff --git a/lib/ohai/plugins/network.rb b/lib/ohai/plugins/network.rb index 319924d2..e7b96475 100644 --- a/lib/ohai/plugins/network.rb +++ b/lib/ohai/plugins/network.rb @@ -82,7 +82,7 @@ Ohai.plugin(:NetworkAddresses) do elsif network[gw_attr] && network["interfaces"][network[int_attr]] && network["interfaces"][network[int_attr]]["addresses"] - if [ "0.0.0.0", "::", /^fe80:/ ].any?(network[gw_attr]) + if [ "0.0.0.0", "::", /^fe80:/ ].any? { |pat| pat === network[gw_attr] } # rubocop: disable Performance/RedundantEqualityComparisonBlock # link level default route logger.trace("Plugin Network: link level default #{family} route, picking ip from #{network[gw_attr]}") r = gw_if_ips.first |