[Dbconfig-common-changes] [dbconfig-common] r225 - in trunk: debian dpkg examples/db-test-pgsql-2.0/debian

[Sean Finney]

Author: seanius
Date: 2006-05-24 19:15:17 +0000 (Wed, 24 May 2006)
New Revision: 225

Modified:
   trunk/debian/dbconfig-common.templates
   trunk/dpkg/common
   trunk/dpkg/config
   trunk/examples/db-test-pgsql-2.0/debian/config
Log:
another attempt at the pgsql authmethod stuff

Modified: trunk/debian/dbconfig-common.templates
===================================================================
--- trunk/debian/dbconfig-common.templates	2006-05-24 17:28:06 UTC (rev 224)
+++ trunk/debian/dbconfig-common.templates	2006-05-24 19:15:17 UTC (rev 225)
@@ -196,7 +196,6 @@
 
 Template: dbconfig-common/db/dbname
 Type: string
-Default: ${pkg}
 _Description: ${dbvendor} database name for ${pkg}:
  Please provide a name for the ${dbvendor} database to be used by ${pkg}.
 
@@ -305,7 +304,6 @@
 Template: dbconfig-common/pgsql/authmethod-user
 Type: select
 __Choices: ident, password
-Default: ${default_authmethod_user}
 _Description: Method for authenticating PostgreSQL user:
  PostgreSQL servers provide several different mechanisms for authenticating
  connections.  Please select what method the database user should use

Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common	2006-05-24 17:28:06 UTC (rev 224)
+++ trunk/dpkg/common	2006-05-24 19:15:17 UTC (rev 225)
@@ -708,6 +708,5 @@
 		if [ "$dbc_dbvendor" ]; then
 			db_subst $dbc_package/$f dbvendor $dbc_dbvendor
 		fi
-		db_subst $dbc_package/$f default_authmethod_user $authmethod_user
 	done
 }

Modified: trunk/dpkg/config
===================================================================
--- trunk/dpkg/config	2006-05-24 17:28:06 UTC (rev 224)
+++ trunk/dpkg/config	2006-05-24 19:15:17 UTC (rev 225)
@@ -271,9 +271,9 @@
 			db_get $dbc_package/pgsql/authmethod-admin
 			authmethod_admin="$RET"
 			# default the user auth method to the admin method
-			# ...but only if the default isn't already specified.
-			if [ ! "$dbc_default_authmethod_user" ]; then
-				db_subst $dbc_package/pgsql/authmethod-user default_authmethod_user "$authmethod_admin"
+			# ...but only if the answer hasn't already been specified.
+			if [ ! "${dbc_authmethod_user}" ]; then
+				db_set $dbc_package/pgsql/authmethod-user "$authmethod_admin"
 			fi
 			db_input medium $dbc_package/pgsql/authmethod-user || true
 		fi

Modified: trunk/examples/db-test-pgsql-2.0/debian/config
===================================================================
--- trunk/examples/db-test-pgsql-2.0/debian/config	2006-05-24 17:28:06 UTC (rev 224)
+++ trunk/examples/db-test-pgsql-2.0/debian/config	2006-05-24 19:15:17 UTC (rev 225)
@@ -6,5 +6,5 @@
 . /usr/share/debconf/confmodule
 . /usr/share/dbconfig-common/dpkg/config.pgsql 
 
-dbc_default_authmethod_user="password"
+dbc_authmethod_user="password"
 dbc_go db-test-pgsql $@