[wellwell-devel] [SCM] Interchange wellwell catalog branch, master, updated. 5fb18fe71d315a1fe1911206bea98cdf7d55e9b5

[JT Justman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange wellwell catalog".

The branch, master has been updated
       via  5fb18fe71d315a1fe1911206bea98cdf7d55e9b5 (commit)
       via  7b7b96f33c98d436ff7b0a2c305c24275fdf53e1 (commit)
      from  b35f5ea9c582220b6ec64d9f4f4ddf355a43fddf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5fb18fe71d315a1fe1911206bea98cdf7d55e9b5
Merge: 7b7b96f33c98d436ff7b0a2c305c24275fdf53e1 b35f5ea9c582220b6ec64d9f4f4ddf355a43fddf
Author: JT <jt at minerva.(none)>
Date:   Thu Jan 29 17:20:05 2009 -0500

    Merge branch 'master' of ssh://jjustman@git.icdevgroup.org/var/git/wellwell

commit 7b7b96f33c98d436ff7b0a2c305c24275fdf53e1
Author: JT <jt at minerva.(none)>
Date:   Thu Jan 29 17:08:46 2009 -0500

    Fix create.pl not honoring the db_admin_user.

-----------------------------------------------------------------------

Summary of changes and diff:
 scripts/create.pl |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/create.pl b/scripts/create.pl
index 99380e3..3cb4643 100644
--- a/scripts/create.pl
+++ b/scripts/create.pl
@@ -243,9 +243,6 @@ if ( $config->create_db() ){
 		$db_admin_pass = $config->db_admin_pass();
 	}
 
-
-	#print "pass: $db_admin_pass"; #DEBUG
-
 	if ( ! $config->db_admin() ){
 
 		if ( $db_type eq 'Pg' ) {
@@ -254,8 +251,13 @@ if ( $config->create_db() ){
 		elsif ( $db_type eq 'mysql' ) {
 			$db_admin = 'root';
 		}
-	}
+    }
+    else {
+       $db_admin = $config->db_admin();
+    }
 	
+    #print "user: $db_admin, pass: $db_admin_pass"; #DEBUG
+
 	# Now actually create database and users
 	my @create_sqls, my $db_template;
 


hooks/post-receive
-- 
Interchange wellwell catalog