From bfc03a54c55b4000c9095ece14e661e117d39f1a Mon Sep 17 00:00:00 2001 From: Bryan Jen Date: Wed, 24 Jun 2015 13:49:19 -0700 Subject: [PATCH] re-orders case statements in manifests to workaround PUP-4520. --- manifests/params.pp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 0e3811f..2dde283 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -52,7 +52,6 @@ class java::params { } 'Debian': { case $::lsbdistcodename { - default: { fail("unsupported release ${::lsbdistcodename}") } 'lenny', 'squeeze', 'lucid', 'natty': { $java = { 'jdk' => { @@ -125,6 +124,7 @@ class java::params { } } } + default: { fail("unsupported release ${::lsbdistcodename}") } } } 'OpenBSD': { @@ -141,11 +141,6 @@ class java::params { } 'Suse': { case $::operatingsystem { - default: { - $jdk_package = 'java-1_6_0-ibm-devel' - $jre_package = 'java-1_6_0-ibm' - } - 'SLES': { case $::operatingsystemmajrelease{ default: { @@ -158,11 +153,14 @@ class java::params { } } } - 'OpenSuSE': { $jdk_package = 'java-1_7_0-openjdk-devel' $jre_package = 'java-1_7_0-openjdk' } + default: { + $jdk_package = 'java-1_6_0-ibm-devel' + $jre_package = 'java-1_6_0-ibm' + } } $java = { 'jdk' => { 'package' => $jdk_package, },