Merge pull request #1198 from webcompas/bugfix_keyring_absent

malikparvez · web-flow · commit cd24e6dc8e65 · 2024-09-23T17:22:07.000+05:30
apt::keyring: Require "source" or "content" only if ensure=present
diff --git a/manifests/keyring.pp b/manifests/keyring.pp
@@ -43,7 +43,7 @@
   ensure_resource('file', $dir, { ensure => 'directory', mode => '0755', })
   if $source and $content {
     fail("Parameters 'source' and 'content' are mutually exclusive")
-  } elsif ! $source and ! $content {
+  } elsif $ensure == 'present' and ! $source and ! $content {
     fail("One of 'source' or 'content' parameters are required")
   }
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`ensure_resource('file', $dir, { ensure => 'directory', mode => '0755', })`
`44`	`44`	`if $source and $content {`
`45`	`45`	`fail("Parameters 'source' and 'content' are mutually exclusive")`
`46`		`- } elsif ! $source and ! $content {`
	`46`	`+ } elsif $ensure == 'present' and ! $source and ! $content {`
`47`	`47`	`fail("One of 'source' or 'content' parameters are required")`
`48`	`48`	`}`
`49`	`49`