Skip to content

Commit

Permalink
Merge pull request dgolja#24 from edestecd/master
Browse files Browse the repository at this point in the history
Fix proxy error
  • Loading branch information
dgolja authored Jan 12, 2018
2 parents 74bc23a + c76c97d commit 9a8f1cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/puppet/provider/gnupg_key/gnupg.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def add_key
end

def add_key_from_key_server
if resource[:proxy].empty?
if resource[:proxy].nil? or resource[:proxy].empty?
command = "gpg --keyserver #{resource[:key_server]} --recv-keys #{resource[:key_id]}"
else
command = "gpg --keyserver #{resource[:key_server]} --keyserver-options http-proxy=#{resource[:proxy]} --recv-keys #{resource[:key_id]}"
Expand Down

0 comments on commit 9a8f1cd

Please sign in to comment.