diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-03-30 23:07:19 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-03-30 23:07:19 -0400 |
| commit | 9542185b9e59836211caecf9e34dc355619909d1 (patch) | |
| tree | e4625acb56dc936f8279023cae1c10ee9147761a | |
| parent | v2: param, nested regex match fix (backport from v3) (diff) | |
v2, v3: sysenv, remove repeated method
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v2 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 3 | ||||
| -rw-r--r-- | lib/sisu/v2/sysenv.rb | 3 | ||||
| -rw-r--r-- | lib/sisu/v3/sysenv.rb | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 62f4f9eb..74cab770 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -18,6 +18,8 @@ http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.6-1 * (ruby 1.9.2 fixes) * param, nested regex match backport from v3 + * sysenv, remove repeated method + %% 2.9.0.orig.tar.gz (2011-03-24:12/4) [see 3.0.5] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.5-1 diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 9118ec82..bd06bb20 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -20,6 +20,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.6.orig.tar.gz sisu_3.0.6-1.dsc sisu_3.0.6-1.debian.tar.gz + + * sysenv, remove repeated method + %% 3.0.5.orig.tar.gz (2011-03-24:12/4) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.5-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.5.orig.tar.gz diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index ef6d86c7..72b1ffc7 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -2757,9 +2757,6 @@ WOK ? @rc['db']['postgresql']['port'] \ : (@defaults[:postgresql_port]) end - def dbi - "DBI:Pg:database=#{psql.db};port=#{psql.port}" - end def password ((defined? @rc['db']['postgresql']['password']) \ && @rc['db']['postgresql']['password']=~/\S+/) \ diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index d4d0f16d..7cc2a327 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -3647,9 +3647,6 @@ WOK ? @rc['db']['postgresql']['port'] \ : (@defaults[:postgresql_port]) end - def dbi - "DBI:Pg:database=#{psql.db};port=#{psql.port}" - end def password ((defined? @rc['db']['postgresql']['password']) \ && @rc['db']['postgresql']['password']=~/\S+/) \ |