[Dbconfig-common-devel] dbconfig-common/dpkg common,1.13,1.14 config,1.11,1.12 postinst,1.7,1.8

[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-serv18864/dpkg

Modified Files:
	common config postinst 
Log Message:
see the changelog for details.  1.6 done and uploaded to experimental


Index: common
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/common,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- common	18 Apr 2005 00:43:35 -0000	1.13
+++ common	18 Apr 2005 03:48:41 -0000	1.14
@@ -147,13 +147,13 @@
 	_dbc_sanity_check dbtype || dbc_install_error
 
 	# get app user
-	db_get $dbc_packagedb/app-user && dbc_dbuser="$RET"
+	db_get $dbc_package/$dbc_dbtype/app-user && dbc_dbuser="$RET"
 
 	# get the db server
 	db_get $dbc_package/remote/host && dbc_dbserver="$RET"
 
 	# get the name of the database to be created
-	db_get $dbc_packagedb/dbname && dbc_dbname="$RET"
+	db_get $dbc_package/$dbc_dbtype/dbname && dbc_dbname="$RET"
 
 	# get the database administrator name
 	db_get $dbc_package/$dbc_dbtype/admin-user && dbc_dbadmin="$RET"

Index: config
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/config,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- config	1 Apr 2005 23:52:47 -0000	1.11
+++ config	18 Apr 2005 03:48:42 -0000	1.12
@@ -111,14 +111,14 @@
 			db_set $dbc_package/dbconfig-remove "$dbc_remove"
 		fi      
 		if [ "$dbc_dbuser" ]; then 
-			db_set $dbc_packagedb/app-user "$dbc_dbuser"
+			db_set $dbc_package/$dbc_dbtype/app-user "$dbc_dbuser"
 		fi      
 		if [ "$dbc_dbpass" ]; then 
 			db_set $dbc_package/$dbc_dbtype/app-pass "$dbc_dbpass"
 			db_fset $dbc_package/$dbc_dbtype/app-pass seen true
 		fi      
 		if [ "$dbc_dbname" ]; then 
-			db_set $dbc_packagedb/dbname "$dbc_dbname"
+			db_set $dbc_package/$dbc_dbtype/dbname "$dbc_dbname"
 		fi      
 		if [ "$dbc_dbserver" ]; then
 			db_set $dbc_package/remote/host "$dbc_dbserver"
@@ -244,14 +244,14 @@
 			dbc_dbadmpass=`dbc_get_admin_pass $dbc_package $dbc_dbtype`
 		fi
 
-		db_input low $dbc_packagedb/app-user || true
+		db_input low $dbc_package/$dbc_dbtype/app-user || true
 
 		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_packagedb/dbname || true
+		db_input low $dbc_package/$dbc_dbtype/dbname || true
 	;;
 	# * - end state
 	*)

Index: postinst
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/postinst,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- postinst	17 Mar 2005 05:18:41 -0000	1.7
+++ postinst	18 Apr 2005 03:48:42 -0000	1.8
@@ -73,23 +73,14 @@
 		dbc_sqlfile=$dbc_share/data/$dbc_package/install/$dbc_dbtype
 		dbc_scriptfile=$dbc_share/scripts/$dbc_package/install/$dbc_dbtype
 		if [ -f $dbc_sqlfile -a ! "$dbc_dbstatus" = "nothing" ]; then
-			$dbc_sqlfile_cmd $dbc_sqlfile
-			# check for errors
-			if [ "$status" = "error" ]; then
-				install_error "creating database"
-			fi
+			$dbc_sqlfile_cmd $dbc_sqlfile || dbc_install_error "populating database"
 		fi
 
 		if [ -f $dbc_scriptfile -a ! "$dbc_dbstatus" = "nothing" ]; then
 			# temporarily ignore non-zero exit vals so we can handle them
-			set +e
-			sh -c "$dbc_scriptfile $*"
-			_dbc_retval=$?
-			set -e
-			# check for errors
-			if [ $_dbc_retval -ne 0 ]; then
+			if ! sh -c "$dbc_scriptfile $*"; then
 				dbc_error="$dbc_scriptfile exited with non-zero status"
-				dbc_install_error "creating database"
+				dbc_install_error "populating database"
 			fi
 		fi