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
Release prep v9.1.0
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index cd408d8f67e0da8140c1edd4bf67706c8cfa53d5..b30b418d72abc9c66ae6903be4996c50c20fbc1f 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-200,7
+200,7
@@
class apt (
assert_type(Integer, $update['tries'])
}
assert_type(Integer, $update['tries'])
}
- $_update =
merge($apt::update_defaults, $update)
+ $_update =
$apt::update_defaults + $update
include apt::update
if $purge['sources.list'] {
include apt::update
if $purge['sources.list'] {
@@
-222,11
+222,11
@@
class apt (
assert_type(Boolean, $purge['apt.conf.d'])
}
assert_type(Boolean, $purge['apt.conf.d'])
}
- $_purge =
merge($apt::purge_defaults, $purge)
+ $_purge =
$apt::purge_defaults + $purge
if $proxy['perhost'] {
$_perhost = $proxy['perhost'].map |$item| {
if $proxy['perhost'] {
$_perhost = $proxy['perhost'].map |$item| {
- $_item =
merge($apt::proxy_defaults, $item)
+ $_item =
$apt::proxy_defaults + $item
$_scheme = $_item['https'] ? {
true => 'https',
default => 'http',
$_scheme = $_item['https'] ? {
true => 'https',
default => 'http',
@@
-239,17
+239,13
@@
class apt (
true => 'DIRECT',
default => "${_scheme}://${_item['host']}${_port}/",
}
true => 'DIRECT',
default => "${_scheme}://${_item['host']}${_port}/",
}
- merge($item, {
- 'scheme' => $_scheme,
- 'target' => $_target,
- }
- )
+ $item + { 'scheme' => $_scheme, 'target' => $_target, }
}
} else {
$_perhost = {}
}
}
} else {
$_perhost = {}
}
- $_proxy =
merge($apt::proxy_defaults, $proxy, { 'perhost' => $_perhost })
+ $_proxy =
$apt::proxy_defaults + $proxy + { 'perhost' => $_perhost }
$confheadertmp = epp('apt/_conf_header.epp')
$proxytmp = epp('apt/proxy.epp', { 'proxies' => $_proxy })
$confheadertmp = epp('apt/_conf_header.epp')
$proxytmp = epp('apt/proxy.epp', { 'proxies' => $_proxy })
@@
-386,12
+382,12
@@
class apt (
case $facts['os']['name'] {
'Debian': {
if versioncmp($facts['os']['release']['major'], '9') >= 0 {
case $facts['os']['name'] {
'Debian': {
if versioncmp($facts['os']['release']['major'], '9') >= 0 {
- ensure_packages(['gnupg'])
+
stdlib::
ensure_packages(['gnupg'])
}
}
'Ubuntu': {
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
}
}
'Ubuntu': {
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
- ensure_packages(['gnupg'])
+
stdlib::
ensure_packages(['gnupg'])
}
}
default: {
}
}
default: {