place default case last in selectors
According to the selector documentation (https://docs.puppetlabs.com/puppet/latest/reference/lang_conditional.html#selectors), the default case should be last: "Cases are compared in the order that they are written in the manifest; thus, the default case (if any) must be at the end of the list." This is fixed in 3.7+ but would be nice to fix in this module for people using < 3.7 See also https://tickets.puppetlabs.com/browse/PUP-2642
This commit is contained in:
@@ -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:': }
|
||||||
|
|||||||
Reference in New Issue
Block a user