From 73d200fedcb60b3fb1daeba3bff49f8a5881b183 Mon Sep 17 00:00:00 2001 From: Tomas Barton Date: Thu, 7 Sep 2017 14:18:08 +0200 Subject: [PATCH] (MODULES-4686) fix incorrect GPG keys parsing on Debian 9 patch from Alex P (alexpr) --- lib/puppet/provider/apt_key/apt_key.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb index 631efde..3f95c3c 100644 --- a/lib/puppet/provider/apt_key/apt_key.rb +++ b/lib/puppet/provider/apt_key/apt_key.rb @@ -26,17 +26,25 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do key_output = apt_key(cli_args) end - pub_line, fpr_line = nil + pub_line, sub_line, fpr_line = nil key_array = key_output.split("\n").collect do |line| if line.start_with?('pub') pub_line = line # reset fpr_line, to skip any previous subkeys which were collected fpr_line = nil + sub_line = nil + elsif line.start_with?('sub') + sub_line = line elsif line.start_with?('fpr') fpr_line = line end + if (sub_line and fpr_line) + sub_line, fpr_line = nil + next + end + next unless (pub_line and fpr_line) line_hash = key_line_hash(pub_line, fpr_line) -- 2.32.3