From: Henry <h.paulissen@tmg.nl>
Date: Thu, 5 Oct 2017 11:54:32 +0000 (+0200)
Subject: Fixed circular dependency for package dirmngr
X-Git-Tag: 4.4.1~11^2~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cd2b1dfd2321f9e12b7d6ce29497d0d44914dd14;p=puppet-modules%2Fpuppetlabs-apt.git

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 44e66ce..570cd3b 100644
--- 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 8f9d66b..a8c9f54 100644
--- 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: { }