Switch from merge() to native puppet

diff --git a/manifests/init.pp b/manifests/init.pp
index cd408d8f67e0da8140c1edd4bf67706c8cfa53d5..a8b666e8f753e3b510eba78e0c353c6c4aaa00aa 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -200,7 +200,7 @@ class apt (
     assert_type(Integer, $update['tries'])
   }
 
-  $_update = merge($apt::update_defaults, $update)
+  $_update = $apt::update_defaults + $update
   include apt::update
 
   if $purge['sources.list'] {
@@ -222,11 +222,11 @@ class apt (
     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| {
-      $_item = merge($apt::proxy_defaults, $item)
+      $_item = $apt::proxy_defaults + $item
       $_scheme = $_item['https'] ? {
         true    => 'https',
         default => 'http',
@@ -239,17 +239,13 @@ class apt (
         true    => 'DIRECT',
         default => "${_scheme}://${_item['host']}${_port}/",
       }
-      merge($item, {
-          'scheme' => $_scheme,
-          'target' => $_target,
-        }
-      )
+      $item + { 'scheme' => $_scheme, 'target' => $_target, }
     }
   } 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 })

diff --git a/manifests/source.pp b/manifests/source.pp
index 420d19d451e312bcc52144246bf2f1374d1b0158..6d16b5ef5c4a26ee36ba0681e83315c7c62c2a71 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -114,7 +114,7 @@ define apt::source (
     $_location = undef
   }
 
-  $includes = merge($apt::include_defaults, $include)
+  $includes = $apt::include_defaults + $include
 
   if $key and $keyring {
     fail('parameters key and keyring are mutualy exclusive')
@@ -125,7 +125,7 @@ define apt::source (
       unless $key['id'] {
         fail('key hash must contain at least an id entry')
       }
-      $_key = merge($apt::source_key_defaults, $key)
+      $_key = $apt::source_key_defaults + $key
     } else {
       $_key = { 'id' => assert_type(String[1], $key) }
     }
@@ -164,7 +164,7 @@ define apt::source (
 
   if $pin {
     if $pin =~ Hash {
-      $_pin = merge($pin, { 'ensure' => $ensure, 'before' => $_before })
+      $_pin = $pin + { 'ensure' => $ensure, 'before' => $_before }
     } elsif ($pin =~ Numeric or $pin =~ String) {
       $url_split = split($location, '[:\/]+')
       $host      = $url_split[1]