Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MODULES-10956 remove redundant code in provider apt_key #973

Merged
merged 1 commit into from
Mar 8, 2021
Merged

MODULES-10956 remove redundant code in provider apt_key #973

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions lib/puppet/provider/apt_key/apt_key.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,29 +177,7 @@ def tempfile(content)
file
end

# Update a key if it is expired
def update_expired_key
# Return without doing anything if refresh or expired is false
return unless resource[:refresh] == true && resource[:expired] == true

# Execute command to update key
command = []

unless resource[:source].nil? && resource[:content].nil?
raise(_('an unexpected condition occurred while trying to add the key: %{_resource}') % { _resource: resource[:id] })
end

# Breaking up the command like this is needed because it blows up
# if --recv-keys isn't the last argument.
command.push('adv', '--no-tty', '--keyserver', resource[:server])
unless resource[:options].nil?
command.push('--keyserver-options', resource[:options])
end
command.push('--recv-keys', resource[:id])
end

def exists?
update_expired_key
# report expired keys as non-existing when refresh => true
@property_hash[:ensure] == :present && !(resource[:refresh] && @property_hash[:expired])
end
Expand Down