mysql: address Alessandro comments on conditionals for future parser-related fixes.

gwarf · gwarf · commit 5773c7dcc6ae · 2015-09-29T11:03:31.000+02:00
diff --git 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
   }
 

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`# The whole mysql configuration directory can be recursively overriden`
`426`		`- if $mysql::source_dir != '' {`
	`426`	`+ if $mysql::source_dir and $mysql::source_dir != '' {`
`427`	`427`	`file { 'mysql.dir':`
`428`	`428`	`ensure => directory,`
`429`	`429`	`path => $mysql::config_dir,`
`@@ -439,7 +439,7 @@`
`439`	`439`
`440`	`440`
`441`	`441`	`### Include custom class if $my_class is set`
`442`		`- if $mysql::my_class != '' {`
	`442`	`+ if $mysql::my_class and $mysql::my_class != '' {`
`443`	`443`	`include $mysql::my_class`
`444`	`444`	`}`
`445`	`445`