]> review.fuel-infra Code Review - puppet-modules/puppetlabs-apt.git/commitdiff
Merge pull request #905 from anarcat/no-release
authorcarabasdaniel <daniel.carabas@puppet.com>
Mon, 17 Feb 2020 17:05:55 +0000 (19:05 +0200)
committerGitHub <noreply@github.com>
Mon, 17 Feb 2020 17:05:55 +0000 (19:05 +0200)
MODULES-10543: only consider lsbdistcodename for apt-transport-https

manifests/source.pp

index 3b0b06b3d54a29ae71f78efd98ccc245f567364b..cb75635797ca882832467d64be7d8228b86765aa 100644 (file)
@@ -88,7 +88,7 @@ define apt::source(
     }
     # Newer oses, do not need the package for HTTPS transport.
     $_transport_https_releases = [ 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial' ]
-    if ($_release in $_transport_https_releases or $facts['lsbdistcodename'] in $_transport_https_releases) and $location =~ /(?i:^https:\/\/)/ {
+    if ($facts['lsbdistcodename'] in $_transport_https_releases) and $location =~ /(?i:^https:\/\/)/ {
       ensure_packages('apt-transport-https')
     }
   }