Fixed circular dependency for package dirmngr

Signed-off-by: Henry <h.paulissen@tmg.nl>

diff --git a/manifests/init.pp b/manifests/init.pp
index 44e66ce51ff2dd00980603ae05423c11d092cae3..570cd3bfa803c603f9fe4b016fad2e65364403c4 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -182,7 +182,7 @@ class apt (
   # required for adding GPG keys on Debian 9 (and derivatives)
   case $facts['os']['name'] {
     'Debian': {
-      if versioncmp($facts['os']['release']['full'], '9.0') >= 0 {
+      if versioncmp($facts['os']['release']['major'], '9') >= 0 {
         ensure_packages(['dirmngr'])
       }
     }

diff --git a/manifests/key.pp b/manifests/key.pp
index 8f9d66bcc9a1bf2b45742fec5007a9a849a98f31..a8c9f54950a368463c8bcd95f8d4ca6880519763 100644 (file)
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -36,17 +36,13 @@ define apt::key (
 
         case $facts['os']['name'] {
           'Debian': {
-            if versioncmp($facts['os']['release']['full'], '9.0') >= 0 {
-              Apt::Key<| title == $title |> {
-                require => Package['dirmngr']
-              }
+            if versioncmp($facts['os']['release']['major'], '9') >= 0 {
+              ensure_packages(['dirmngr'])
             }
           }
           'Ubuntu': {
             if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
-              Apt::Key<| title == $title |> {
-                require => Package['dirmngr']
-              }
+              ensure_packages(['dirmngr'])
             }
           }
           default: { }