Merge pull request #728 from timogoebel/fix_nil_object_future_parser

jonnytdevops · jonnytdevops · commit 545f0a591fa6 · 2015-06-25T15:23:15.000+01:00
fix Evaluation Error with future parser
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
@@ -12,7 +12,7 @@
     $service_ensure = undef
   }
 
-  if $mysql::server::override_options['mysqld'] and $mysql::server::override_options['mysqld']['user'] {
+  if $mysql::server::override_options and $mysql::server::override_options['mysqld'] and $mysql::server::override_options['mysqld']['user'] {
     $mysqluser = $mysql::server::override_options['mysqld']['user']
   } else {
     $mysqluser = $options['mysqld']['user']

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`$service_ensure = undef`
`13`	`13`	`}`
`14`	`14`
`15`		`- if $mysql::server::override_options['mysqld'] and $mysql::server::override_options['mysqld']['user'] {`
	`15`	`+ if $mysql::server::override_options and $mysql::server::override_options['mysqld'] and $mysql::server::override_options['mysqld']['user'] {`
`16`	`16`	`$mysqluser = $mysql::server::override_options['mysqld']['user']`
`17`	`17`	`} else {`
`18`	`18`	`$mysqluser = $options['mysqld']['user']`