diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-08 23:24:50 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-09 10:08:52 -0700 |
| commit | cea2e5b3fe03de8ef56a97af25ef8b6dd7eb3d7d (patch) | |
| tree | 26946f96bfdb97f7cba88c1180b5b5a9271565cf | |
| parent | c58e42090f3a1a151406f6a63652c697cb6e687d (diff) | |
| download | puppet-cea2e5b3fe03de8ef56a97af25ef8b6dd7eb3d7d.tar.gz puppet-cea2e5b3fe03de8ef56a97af25ef8b6dd7eb3d7d.tar.xz puppet-cea2e5b3fe03de8ef56a97af25ef8b6dd7eb3d7d.zip | |
[#3582] Remove assumption that Puppet.settings would return values of a consistent type
Currently, we cannot trust Puppet::Util::Settings to return values of
any particular type for a given setting.
This patch makes sure that we explicitly cast to string when checking for
empty values.
| -rw-r--r-- | lib/puppet/rails.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index c0eedfcde..532be1e83 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -50,22 +50,22 @@ module Puppet::Rails when "sqlite3" args[:database] = Puppet[:dblocation] when "mysql", "postgresql" - args[:host] = Puppet[:dbserver] unless Puppet[:dbserver].empty? - args[:port] = Puppet[:dbport] unless Puppet[:dbport].empty? - args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty? - args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].empty? + args[:host] = Puppet[:dbserver] unless Puppet[:dbserver].to_s.empty? + args[:port] = Puppet[:dbport] unless Puppet[:dbport].to_s.empty? + args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].to_s.empty? + args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].to_s.empty? args[:database] = Puppet[:dbname] args[:reconnect]= true socket = Puppet[:dbsocket] - args[:socket] = socket unless socket.empty? + args[:socket] = socket unless socket.to_s.empty? connections = Puppet[:dbconnections].to_i args[:pool] = connections if connections > 0 when "oracle_enhanced": - args[:database] = Puppet[:dbname] unless Puppet[:dbname].empty? - args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty? - args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].empty? + args[:database] = Puppet[:dbname] unless Puppet[:dbname].to_s.empty? + args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].to_s.empty? + args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].to_s.empty? connections = Puppet[:dbconnections].to_i args[:pool] = connections if connections > 0 |