From 4d3b720308964c027674bb08c49f142b4684ff58 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Fri, 9 Oct 2015 14:08:46 -0400 Subject: Simplify conditional expressions --- manifests/init.pp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 16593c7..2660612 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -98,17 +98,15 @@ class apt( # backports uses the normal archive key now package { 'debian-backports-keyring': ensure => absent } - if $use_backports { - if (${::debian_release} != "testing" and ${::debian_release} != "unstable" and ${::debian_release} != "experimental") { + if ($use_backports and !($::debian_release in ['testing', 'unstable', 'experimental'])) { + apt::sources_list { + 'backports': + content => "deb $backports_url ${::debian_codename}-backports ${apt::real_repos}", + } + if $include_src { apt::sources_list { - 'backports': - content => "deb $backports_url ${::debian_codename}-backports ${apt::real_repos}", - } - if $include_src { - apt::sources_list { - 'backports-src': - content => "deb-src $backports_url ${::debian_codename}-backports ${apt::real_repos}", - } + 'backports-src': + content => "deb-src $backports_url ${::debian_codename}-backports ${apt::real_repos}", } } } -- cgit v1.2.3