Merge pull request #1233 from abacusresearch/keyring-filename-fix

imaqsood · web-flow · commit 8fb182580a46 · 2025-09-05T15:21:16.000+05:30
join key dir and key filename/name with slash "/"
diff --git a/manifests/source.pp b/manifests/source.pp
@@ -217,11 +217,11 @@
           }
 
           $_list_keyring = if $_key['dir'] and $_key['filename'] {
-            "${_key['dir']}${_key['filename']}"
+            "${_key['dir']}/${_key['filename']}"
           } elsif $_key['filename'] {
             "/etc/apt/keyrings/${_key['filename']}"
           } elsif $_key['dir'] {
-            "${_key['dir']}${_key['name']}"
+            "${_key['dir']}/${_key['name']}"
           } else {
             "/etc/apt/keyrings/${_key['name']}"
           }

Original file line number	Diff line number	Diff line change
`@@ -217,11 +217,11 @@`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`$_list_keyring = if $_key['dir'] and $_key['filename'] {`
`220`		`- "${_key['dir']}${_key['filename']}"`
	`220`	`+ "${_key['dir']}/${_key['filename']}"`
`221`	`221`	`} elsif $_key['filename'] {`
`222`	`222`	`"/etc/apt/keyrings/${_key['filename']}"`
`223`	`223`	`} elsif $_key['dir'] {`
`224`		`- "${_key['dir']}${_key['name']}"`
	`224`	`+ "${_key['dir']}/${_key['name']}"`
`225`	`225`	`} else {`
`226`	`226`	`"/etc/apt/keyrings/${_key['name']}"`
`227`	`227`	`}`