[Dbconfig-common-changes] [dbconfig-common] r236 - branches/sqlite/dpkg

[Matt Brown]

Author: mattb-guest
Date: 2006-05-30 10:24:49 +0000 (Tue, 30 May 2006)
New Revision: 236

Modified:
   branches/sqlite/dpkg/common
Log:
Only deal with the app-user template when using a database type that supports
authentication


Modified: branches/sqlite/dpkg/common
===================================================================
--- branches/sqlite/dpkg/common	2006-05-29 11:08:08 UTC (rev 235)
+++ branches/sqlite/dpkg/common	2006-05-30 10:24:49 UTC (rev 236)
@@ -190,10 +190,10 @@
 	# set the dbtype
 	db_set $dbc_package/database-type "$dbc_dbtype"
 
-	# set app user
-	db_set $dbc_package/db/app-user "$dbc_dbuser"
+	if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
+		# set app user
+		db_set $dbc_package/db/app-user "$dbc_dbuser"
 
-	if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
 		# set the app user password
 		db_set $dbc_package/$dbc_dbtype/app-pass "$dbc_dbpass"
 
@@ -257,10 +257,10 @@
 	db_get $dbc_package/dbconfig-upgrade && dbc_upgrade="$RET"
 	db_get $dbc_package/dbconfig-remove && dbc_remove="$RET"
 
-	# get app user
-	db_get $dbc_package/db/app-user && dbc_dbuser="$RET"
+	if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
+		# get app user
+		db_get $dbc_package/db/app-user && dbc_dbuser="$RET"
 
-	if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
 		# get the app user password
 		db_get $dbc_package/$dbc_dbtype/app-pass && dbc_dbpass="$RET"