[Dbconfig-common-devel] dbconfig-common/dpkg config,1.5,1.6 preinst,1.3,1.4

[seanius@haydn.debian.org]

Update of /cvsroot/dbconfig-common/dbconfig-common/dpkg
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv7415/dpkg

Modified Files:
	config preinst 
Log Message:
mostly minor cosmetic changes.  small change in the order some questions
are asked, redirecting stderr to /dev/null on a user check function.


Index: config
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config	4 Feb 2005 06:26:07 -0000	1.5
+++ config	7 Feb 2005 14:17:03 -0000	1.6
@@ -81,7 +81,7 @@
 
 		# there's a bit more to do with client/server rdbms
 		if [ "$dbc_dbtype" = "mysql" -o "$dbc_dbtype" = "pgsql" ]; then
-			# if these haven't been specified, default to the... defaults.
+			# if these haven't been specified, use defaults
 			if [ ! "$dbc_dbadmin" ]; then 
 				dbadmin="$dbc_default_admin"; 
 			fi
@@ -200,9 +200,6 @@
 			fi
 		fi
 
-		# get the name of the database to use
-		db_input low $dbc_package/$dbc_dbtype/dbname || true
-
 		# who's the admin user (is there any reason to even ask this?)
 		# TODO: should there be a difference between the local and remote admin?
 		db_input low $dbc_package/$dbc_dbtype/admin-user || true
@@ -218,6 +215,9 @@
 		if [ "$need_userpw" != "false" ]; then
 			dbc_dbpass=`dbc_get_app_pass $dbc_package $dbc_dbtype`
 		fi
+
+		# get the name of the database to use
+		db_input low $dbc_package/$dbc_dbtype/dbname || true
 
 		db_go || true
 	fi

Index: preinst
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/preinst,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- preinst	4 Feb 2005 06:26:07 -0000	1.3
+++ preinst	7 Feb 2005 14:17:03 -0000	1.4
@@ -10,7 +10,6 @@
 ###	
 dbc_go(){
 	. /usr/share/dbconfig-common/dpkg/common
-	set -x
 	dbc_config $@
 
 	case $dbc_command in