From cd2b1dfd2321f9e12b7d6ce29497d0d44914dd14 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 5 Oct 2017 13:54:32 +0200 Subject: [PATCH] Fixed circular dependency for package dirmngr Signed-off-by: Henry --- manifests/init.pp | 2 +- manifests/key.pp | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) 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: { } -- 2.45.2