Skip to content

Commit 541af3b

Browse files
committed
Fixed v4 validate_cmd
1 parent 1f23e3d commit 541af3b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

manifests/conf.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,15 +394,14 @@
394394
$default_validate_cmd = $validate_cmd ? {
395395
'' => undef,
396396
String => $validate_cmd,
397-
Hash => pick_default(getvar("settings.validate_cmd.${base_dir}"), undef),
397+
Hash => getvar("settings.validate_cmd.${base_dir}"),
398398
Undef => undef,
399399
}
400400
$real_validate_cmd = $validate_syntax ? {
401401
undef => $default_validate_cmd,
402402
true => $default_validate_cmd,
403403
false => undef,
404404
}
405-
406405
# Resources
407406
if $path_parent_create {
408407
$path_parent = dirname($real_path)
@@ -532,6 +531,7 @@
532531
}
533532

534533
$default_validate_cmd = $settings['validate_cmd'] ? {
534+
'' => undef,
535535
String => $settings['validate_cmd'],
536536
Hash => $settings['validate_cmd'][$base_dir],
537537
Undef => undef,

0 commit comments

Comments
 (0)