[Dbconfig-common-devel] dbconfig-common/dpkg postinst,1.14,1.15

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

Modified Files:
	postinst 
Log Message:
just about ready for an upload to unstable(!)


Index: postinst
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/postinst,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15

--- postinst	19 May 2005 01:48:33 -0000	1.14
+++ postinst	11 Jul 2005 04:23:01 -0000	1.15
@@ -72,9 +72,16 @@
 		###
 		# sqlfile is the file to use for installing the database, this is
 		dbc_sqlfile=$dbc_share/data/$dbc_package/install/$dbc_dbtype
+		dbc_sqlfile_adm=$dbc_share/data/$dbc_package/install-dbadmin/$dbc_dbtype
 		dbc_scriptfile=$dbc_share/scripts/$dbc_package/install/$dbc_dbtype
 		if [ -f "$dbc_sqlfile" ]; then
+			_dbc_asuser="yes"
 			$dbc_sqlfile_cmd $dbc_sqlfile || dbc_install_error "populating database"
+			_dbc_asuser=""
+			[ "$dbc_tried_again" ] && return 0
+		fi
+		if [ -f "$dbc_sqlfile_adm" ]; then
+			$dbc_sqlfile_cmd $dbc_sqlfile_adm || dbc_install_error "populating database with administrative sql"
 			[ "$dbc_tried_again" ] && return 0
 		fi
 



