diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-05-30 23:11:23 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-05-30 23:11:23 -0400 |
| commit | 134766702ce7c3ec220e9c07cd26aa6a1bf60776 (patch) | |
| tree | a621ea0776f6fa62606e890d4b7e00fc01316c8e /lib/sisu/v4/sysenv.rb | |
| parent | debian/changelog (4.1.2-1) (diff) | |
| parent | v4 v5: cgi_pgsql, cgi helper script sample search form generator, detail (diff) | |
Merge tag 'sisu_4.1.3' into debian/sid
SiSU 4.1.3
Diffstat (limited to 'lib/sisu/v4/sysenv.rb')
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 8 |
1 files changed, 5 insertions, 3 deletions
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']) \ |