From d52e47ad990b6d8dfee4480ce0b76b2f4e64ea37 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Fri, 25 Sep 2015 15:34:19 +0200 Subject: [PATCH 1/2] mysql: fix test for future parser. --- manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 0544a42..3d51357 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -423,7 +423,7 @@ } # The whole mysql configuration directory can be recursively overriden - if $mysql::source_dir { + if $mysql::source_dir != '' { file { 'mysql.dir': ensure => directory, path => $mysql::config_dir, @@ -439,7 +439,7 @@ ### Include custom class if $my_class is set - if $mysql::my_class { + if $mysql::my_class != '' { include $mysql::my_class } From 5773c7dcc6aed18e5eef2b6fc242e8c6194cf5a1 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Tue, 29 Sep 2015 11:03:24 +0200 Subject: [PATCH 2/2] mysql: address Alessandro comments on conditionals for future parser-related fixes. --- manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 3d51357..8551f65 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -423,7 +423,7 @@ } # The whole mysql configuration directory can be recursively overriden - if $mysql::source_dir != '' { + if $mysql::source_dir and $mysql::source_dir != '' { file { 'mysql.dir': ensure => directory, path => $mysql::config_dir, @@ -439,7 +439,7 @@ ### Include custom class if $my_class is set - if $mysql::my_class != '' { + if $mysql::my_class and $mysql::my_class != '' { include $mysql::my_class }