Release prep v9.1.0

[puppet-modules/puppetlabs-apt.git] / manifests / source.pp

diff --git a/manifests/source.pp b/manifests/source.pp
index 8961e1564572123e9f0f8dfb20338ed98e4df401..2386c0a5f3b2eae05fdff5d1864f1e78cc0023a9 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -107,14 +107,14 @@ define apt::source (
     # Newer oses, do not need the package for HTTPS transport.
     $_transport_https_releases = ['9']
     if (fact('os.release.major') in $_transport_https_releases) and $_location =~ /(?i:^https:\/\/)/ {
-      ensure_packages('apt-transport-https')
+      stdlib::ensure_packages('apt-transport-https')
       Package['apt-transport-https'] -> Class['apt::update']
     }
   } else {
     $_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) }
     }
@@ -142,8 +142,8 @@ define apt::source (
   $sourcelist = epp('apt/source.list.epp', {
       'comment'          => $comment,
       'includes'         => $includes,
-      'options'          => delete_undef_values( {
-          'arch'              => $architecture,
+      'options'          => delete_undef_values({
+          'arch'              => $_architecture,
           'trusted'           => $allow_unsigned ? { true => 'yes', false => undef },
           'allow-insecure'    => $allow_insecure ? { true => 'yes', false => undef },
           'signed-by'         => $keyring,
@@ -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]