Skip to content

Commit 8d35d59

Browse files
committed
(ISSUE-1036) Conditional gnupg include added to init.pp
Originally removed as it was causing `gnupg` to be installed in all OS when it wasn't needed, removing it seems to have caused a dependency cycle in the relevant Debian family OS for certain community members. Adding the include back within a conditional statement to solve the issue while still preventing it from being included when unneeded.
1 parent f837fd2 commit 8d35d59

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

manifests/init.pp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,4 +358,20 @@
358358
if $pins {
359359
create_resources('apt::pin', $pins)
360360
}
361+
362+
case $facts['os']['name'] {
363+
'Debian': {
364+
if versioncmp($facts['os']['release']['major'], '9') >= 0 {
365+
ensure_packages(['gnupg'])
366+
}
367+
}
368+
'Ubuntu': {
369+
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
370+
ensure_packages(['gnupg'])
371+
}
372+
}
373+
default: {
374+
# Nothing in here
375+
}
376+
}
361377
}

0 commit comments

Comments
 (0)