From: Tomas Barton <barton.tomas@gmail.com>
Date: Thu, 7 Sep 2017 12:18:08 +0000 (+0200)
Subject: (MODULES-4686) fix incorrect GPG keys parsing on Debian 9
X-Git-Tag: 4.2.0~10^2~4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=73d200fedcb60b3fb1daeba3bff49f8a5881b183;hp=a541b4ee32ea39f3eb23d4ffa3311daba61d1118;p=puppet-modules%2Fpuppetlabs-apt.git

(MODULES-4686) fix incorrect GPG keys parsing on Debian 9

patch from Alex P (alexpr)
---

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)