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
(FM-7316) - i18n Process implemented and .pot file generated
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
key.pp
diff --git
a/manifests/key.pp
b/manifests/key.pp
index 8f9d66bcc9a1bf2b45742fec5007a9a849a98f31..8b77978ffb8d70863f01fcdc8fb9e41a9c5ee775 100644
(file)
--- a/
manifests/key.pp
+++ b/
manifests/key.pp
@@
-8,20
+8,25
@@
define apt::key (
Optional[String] $options = undef,
) {
Optional[String] $options = undef,
) {
- validate_re($id, ['\A(0x)?[0-9a-fA-F]{8}\Z', '\A(0x)?[0-9a-fA-F]{16}\Z', '\A(0x)?[0-9a-fA-F]{40}\Z'])
+ assert_type(
+ Pattern[
+ /\A(0x)?[0-9a-fA-F]{8}\Z/,
+ /\A(0x)?[0-9a-fA-F]{16}\Z/,
+ /\A(0x)?[0-9a-fA-F]{40}\Z/,
+ ], $id)
if $source {
if $source {
-
validate_re($source, ['\Ahttps?:\/\/', '\Aftp:\/\/', '\A\/\w+']
)
+
assert_type(Pattern[/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/], $source
)
}
if $server {
}
if $server {
-
validate_re($server,['\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$']
)
+
assert_type(Pattern[/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/], $server
)
}
case $ensure {
present: {
if defined(Anchor["apt_key ${id} absent"]){
}
case $ensure {
present: {
if defined(Anchor["apt_key ${id} absent"]){
- fail(
"key with id ${id} already ensured as absent"
)
+ fail(
translate('key with id %{_id} already ensured as absent'),{'_id' => id}
)
}
if !defined(Anchor["apt_key ${id} present"]) {
}
if !defined(Anchor["apt_key ${id} present"]) {
@@
-36,17
+41,15
@@
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'])
+ Apt::Key<| title == $title |>
}
}
'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'])
+ Apt::Key<| title == $title |>
}
}
default: { }
}
}
default: { }
@@
-56,7
+59,7
@@
define apt::key (
absent: {
if defined(Anchor["apt_key ${id} present"]){
absent: {
if defined(Anchor["apt_key ${id} present"]){
- fail(
"key with id ${id} already ensured as present"
)
+ fail(
translate('key with id %{_id} already ensured as present', {'_id' => id})
)
}
if !defined(Anchor["apt_key ${id} absent"]){
}
if !defined(Anchor["apt_key ${id} absent"]){
@@
-72,7
+75,7
@@
define apt::key (
}
default: {
}
default: {
- fail
"Invalid 'ensure' value '${ensure}' for apt::key"
+ fail
translate('Invalid \'ensure\' value \'%{_ensure}\' for apt::key', {'_ensure' => ensure})
}
}
}
}
}
}