From ec3c20e288ec8af8d8955d73c0c41043c29a7684 Mon Sep 17 00:00:00 2001 From: Christophe Bliard Date: Fri, 29 Aug 2014 16:57:09 +0200 Subject: [PATCH] Prefer `if/else` over `?` selector with `default` --- manifests/backports.pp | 23 ++++++++++++----------- manifests/params.pp | 29 +++++++++++++++-------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/manifests/backports.pp b/manifests/backports.pp index c45bc15..ee46209 100644 --- a/manifests/backports.pp +++ b/manifests/backports.pp @@ -39,17 +39,18 @@ class apt::backports( } if $::lsbdistid == 'LinuxMint' { - $distid = $::lsbdistcodename ? { - 'debian' => 'debian', - default => 'ubuntu', - } - $release_real = $::lsbdistcodename ? { - 'debian' => 'wheezy', - 'qiana' => 'trusty', - 'petra' => 'saucy', - 'olivia' => 'raring', - 'nadia' => 'quantal', - 'maya' => 'precise', + if $::lsbdistcodename == 'debian' { + $distid = 'debian' + $release_real = 'wheezy' + } else { + $distid = 'ubuntu' + $release_real = $::lsbdistcodename ? { + 'qiana' => 'trusty', + 'petra' => 'saucy', + 'olivia' => 'raring', + 'nadia' => 'quantal', + 'maya' => 'precise', + } } } else { $distid = $::lsbdistid diff --git a/manifests/params.pp b/manifests/params.pp index 20ad8d8..d073c36 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -6,24 +6,25 @@ class apt::params { $preferences_d = "${root}/preferences.d" case $::lsbdistid { - 'linuxmint': { - $distid = $::lsbdistcodename ? { - 'debian' => 'debian', - default => 'ubuntu', - } - $distcodename = $::lsbdistcodename ? { - 'debian' => 'wheezy', - 'qiana' => 'trusty', - 'petra' => 'saucy', - 'olivia' => 'raring', - 'nadia' => 'quantal', - 'maya' => 'precise', - } - } 'ubuntu', 'debian': { $distid = $::lsbdistid $distcodename = $::lsbdistcodename } + 'linuxmint': { + if $::lsbdistcodename == 'debian' { + $distid = 'debian' + $distcodename = 'wheezy' + } else { + $distid = 'ubuntu' + $distcodename = $::lsbdistcodename ? { + 'qiana' => 'trusty', + 'petra' => 'saucy', + 'olivia' => 'raring', + 'nadia' => 'quantal', + 'maya' => 'precise', + } + } + } '': { fail('Unable to determine lsbdistid, is lsb-release installed?') } -- 2.32.3