From 28430c48e0849d47eec9f6b554592bef19b2fc26 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Fri, 23 Nov 2007 19:39:55 -0600
Subject: Adding patch
 20070913032546-6856b-0de200e8450920e7f712c54bf287ae43c7fda8af.patch from
 womble -- Only set dbuser if explicitly asked for

---
 lib/puppet/rails.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/puppet')

diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index c8a06ea1d..bdb3a3cdc 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -42,7 +42,7 @@ module Puppet::Rails
             args[:dbfile] = Puppet[:dblocation]
         when "mysql", "postgresql":
             args[:host]     = Puppet[:dbserver] unless Puppet[:dbserver].empty?
-            args[:username] = Puppet[:dbuser]
+            args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty?
             args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].empty?
             args[:database] = Puppet[:dbname]
             args[:args]     = Puppet[:dbsocket] unless Puppet[:dbsocket] == ""
-- 
cgit