RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Merge pull request #64 from kian/master

Browse Source 
place default case last in selectors
This commit is contained in:
Morgan Haskel
2014-10-29 18:48:16 -04:00
parent 3c41c8ae8b a04e88d658
commit 7224baa72d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/init.pp
View File

@@ -58,28 +58,28 @@ class java(
} }
$use_java_package_name = $package ? { $use_java_package_name = $package ? {
default => $package,
undef => $default_package_name, undef => $default_package_name,
default => $package,
} }
## If $java_alternative is set, use that. ## If $java_alternative is set, use that.
## Elsif the DEFAULT package is being used, then use $default_alternative. ## Elsif the DEFAULT package is being used, then use $default_alternative.
## Else undef ## Else undef
$use_java_alternative = $java_alternative ? { $use_java_alternative = $java_alternative ? {
default => $java_alternative,
undef => $use_java_package_name ? { undef => $use_java_package_name ? {
$default_package_name => $default_alternative, $default_package_name => $default_alternative,
default => undef, default => undef,
} },
default => $java_alternative,
} }
## Same logic as $java_alternative above. ## Same logic as $java_alternative above.
$use_java_alternative_path = $java_alternative_path ? { $use_java_alternative_path = $java_alternative_path ? {
default => $java_alternative_path,
undef => $use_java_package_name ? { undef => $use_java_package_name ? {
$default_package_name => $default_alternative_path, $default_package_name => $default_alternative_path,
default => undef, default => undef,
} },
default => $java_alternative_path,
} }
anchor { 'java::begin:': } anchor { 'java::begin:': }