Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed circular dependency for package dirmngr
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
key.pp
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': {
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 {
}
}
'Ubuntu': {
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
- Apt::Key<| title == $title |> {
- require => Package['dirmngr']
- }
+ ensure_packages(['dirmngr'])
}
}
default: { }
}
}
default: { }