From 462a53a0af3d35952d435716adfacda0029bddd4 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 30 May 2013 23:06:45 -0400 Subject: v4 v5: sysenv, pgsql db connect fix --- lib/sisu/v4/sysenv.rb | 8 +++++--- lib/sisu/v5/sysenv.rb | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index 6bc97396..f95622b5 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -4067,10 +4067,12 @@ WOK self end def psql - def user(opt) - if opt.mod.inspect =~/--db-user[=-]["']?(\S+)["']+/ + def user(opt=nil) + x=if opt \ + and opt.mod.inspect =~/--db-user[=-]["']?(\S+)["']+/ m=$1 - elsif opt.mod =~/--webserv[=-]webrick/ + elsif opt \ + and opt.mod =~/--webserv[=-]webrick/ @env.user else ((defined? @rc['db']['postgresql']['user']) \ diff --git a/lib/sisu/v5/sysenv.rb b/lib/sisu/v5/sysenv.rb index edaec7f8..37492716 100644 --- a/lib/sisu/v5/sysenv.rb +++ b/lib/sisu/v5/sysenv.rb @@ -4067,10 +4067,12 @@ WOK self end def psql - def user(opt) - if opt.mod.inspect =~/--db-user[=-]["']?(\S+)["']+/ + def user(opt=nil) + x=if opt \ + and opt.mod.inspect =~/--db-user[=-]["']?(\S+)["']+/ m=$1 - elsif opt.mod =~/--webserv[=-]webrick/ + elsif opt \ + and opt.mod =~/--webserv[=-]webrick/ @env.user else ((defined? @rc['db']['postgresql']['user']) \ -- cgit v1.2.3