]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
Switch old $release and $codename local variables to new debian_* facts
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Fri, 9 Oct 2015 17:50:43 +0000 (13:50 -0400)
committerGabriel Filion <gabster@lelutin.ca>
Fri, 4 Dec 2015 17:36:25 +0000 (12:36 -0500)
manifests/init.pp

index 4f5dd254397655f2d40c2b46bceef7c785a71191..16593c7119b31252b32f25992783b996b6b2e2c1 100644 (file)
@@ -99,15 +99,15 @@ class apt(
   package { 'debian-backports-keyring': ensure => absent }
 
   if $use_backports {
-    if ($release != "testing" and $release != "unstable" and $release != "experimental") {
+    if (${::debian_release} != "testing" and ${::debian_release} != "unstable" and ${::debian_release} != "experimental") {
       apt::sources_list {
-        "${codename}-backports":
-          content => "deb $backports_url ${codename}-backports ${apt::real_repos}",
+        'backports':
+          content => "deb $backports_url ${::debian_codename}-backports ${apt::real_repos}",
       }
       if $include_src {
         apt::sources_list {
-          "${codename}-backports-src":
-            content => "deb-src $backports_url ${codename}-backports ${apt::real_repos}",
+          'backports-src':
+            content => "deb-src $backports_url ${::debian_codename}-backports ${apt::real_repos}",
         }
       }
     }