Prefer `if/else` over `?` selector with `default`

diff --git a/manifests/backports.pp b/manifests/backports.pp
index c45bc15682de4933f261a01b3827c5c469f202a9..ee462094d4a1f037b1c0d6a090054fd58313c8c6 100644 (file)
--- 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 20ad8d8dd785263a3e5a43549b2df46844012eae..d073c3645dc867e96204ce94667dd46e45d9e1f7 100644 (file)
--- 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?')
     }