diff options
| author | Tim Smith <tsmith@chef.io> | 2020-08-03 17:07:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-03 17:07:35 -0700 |
| commit | 4bbab9bf356c0143935ee70ddfeddef2a7382821 (patch) | |
| tree | fb6d9908e148ba0f9ac292c2ac514e1a7056cee2 | |
| parent | 93ba95d8b656c9baf35b4709abff06bc809c9be6 (diff) | |
| parent | 8bf86b11c041d4041988a4f12c40502ccef72611 (diff) | |
| download | chef-4bbab9bf356c0143935ee70ddfeddef2a7382821.tar.gz | |
Merge pull request #10253 from chef/we-need-to-go-deeper
apt_repository: Small code refactor in key_is_valid? method
| -rw-r--r-- | lib/chef/resource/apt_repository.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/chef/resource/apt_repository.rb b/lib/chef/resource/apt_repository.rb index 4ffd18cb3b..bc0c904745 100644 --- a/lib/chef/resource/apt_repository.rb +++ b/lib/chef/resource/apt_repository.rb @@ -192,16 +192,7 @@ class Chef # # @return [Boolean] is the key valid or not def key_is_valid?(key) - valid = true - - so = shell_out("apt-key", "list") - so.stdout.split(/\n/).map do |t| - if %r{^\/#{key}.*\[expired: .*\]$}.match?(t) - logger.debug "Found expired key: #{t}" - valid = false - break - end - end + valid = shell_out("apt-key", "list").stdout.each_line.none?(%r{^\/#{key}.*\[expired: .*\]$}) logger.debug "key #{key} #{valid ? "is valid" : "is not valid"}" valid |