[Dbconfig-common-devel] dbconfig-common/dpkg common,1.10,1.11

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

Modified Files:
	common 
Log Message:
changelog updated, a template question was moved further up in the file for
the sake of being better organized.  i think the templates are now ready
for large-scale translation.  i'll be posting to the translator's list
tonight.



Index: common
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/common,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11

--- common	14 Mar 2005 01:42:41 -0000	1.10
+++ common	31 Mar 2005 03:54:37 -0000	1.11
@@ -30,13 +30,13 @@
 	### some internal variables
 	###
 	# templates common to all database types
-	dbc_standard_templates="database-type dbconfig-install dbconfig-upgrade dbconfig-remove purge upgrade-backup passwords-do-not-match install-error upgrade-error remove-error"
+	dbc_standard_templates="database-type dbconfig-install dbconfig-upgrade dbconfig-remove password-confirm purge upgrade-backup passwords-do-not-match install-error upgrade-error remove-error"
 
 	# templates common to mysql database types
-	dbc_mysql_templates="mysql/dbname mysql/method mysql/host mysql/newhost mysql/app-user mysql/app-pass mysql/app-pass2 mysql/admin-user mysql/admin-pass mysql/admin-pass2 mysql/port"
+	dbc_mysql_templates="mysql/dbname mysql/method mysql/host mysql/newhost mysql/app-user mysql/app-pass mysql/admin-user mysql/admin-pass mysql/port"
 
 	# templates common to postgresql database types
-	dbc_pgsql_templates="pgsql/dbname pgsql/method pgsql/host pgsql/newhost pgsql/app-user pgsql/app-pass pgsql/app-pass2 pgsql/admin-user pgsql/admin-pass pgsql/admin-pass2 pgsql/port pgsql/authmethod-admin pgsql/authmethod-user pgsql/changeconf pgsql/manualconf"
+	dbc_pgsql_templates="pgsql/dbname pgsql/method pgsql/host pgsql/newhost pgsql/app-user pgsql/app-pass pgsql/admin-user pgsql/admin-pass pgsql/port pgsql/authmethod-admin pgsql/authmethod-user pgsql/changeconf pgsql/manualconf"
 
 	# all dbtypes supported by dbconfig-common
 	dbc_all_supported_dbtypes="mysql pgsql"
@@ -349,8 +349,8 @@
 		echo dbconfig-common: flushing administrative password >&2
 		db_reset $dbc_package/$dbc_dbtype/admin-pass 
 		db_fset $dbc_package/$dbc_dbtype/admin-pass seen false 
-		db_reset $dbc_package/$dbc_dbtype/admin-pass2 
-		db_fset $dbc_package/$dbc_dbtype/admin-pass2 seen false 
+		db_reset $dbc_package/password-confirm
+		db_fset $dbc_package/$dbc_dbtype/password-confirm seen false 
 	fi
 }
 
@@ -361,8 +361,8 @@
 	echo dbconfig-common: flushing database application password >&2
 	db_reset $dbc_package/$dbc_dbtype/app-pass || true
 	db_fset $dbc_package/$dbc_dbtype/app-pass seen false || true
-	db_reset $dbc_package/$dbc_dbtype/app-pass2 || true
-	db_fset $dbc_package/$dbc_dbtype/app-pass2 seen false || true
+	db_reset $dbc_package/password-confirm || true
+	db_fset $dbc_package/password-confirm seen false || true
 }
 
 ##
@@ -382,20 +382,21 @@
 
 	# make sure the passwords are the same, safely
 	while [ ! "$have_admin_pass" ]; do
+		# forget the password-confirm question first, as it's shared
+		db_reset $dbc_package/password-confirm
+		db_fset $dbc_package/password-confirm seen false
+
 		# get the administrative password
 		db_input high $dbc_package/$dbc_dbtype/admin-pass || true
 
-		# actually get the info
-		db_go || true
-		db_get $dbc_package/$dbc_dbtype/admin-pass
-		pass1="$RET"
-
 		# get the password again
-		db_input high $dbc_package/$dbc_dbtype/admin-pass2 || true
+		db_input high $dbc_package/password-confirm || true
 
-		# again, actually get it
+		# actually get the passwords
 		db_go || true
-		db_get $dbc_package/$dbc_dbtype/admin-pass2
+		db_get $dbc_package/$dbc_dbtype/admin-pass
+		pass1="$RET"
+		db_get $dbc_package/password-confirm
 		pass2="$RET"
 
 		# test to see if the passwords match
@@ -404,9 +405,7 @@
 		else
 			# tell them the passwords didn't match, loop again
 			db_reset $dbc_package/$dbc_dbtype/admin-pass
-			db_reset $dbc_package/$dbc_dbtype/admin-pass2
 			db_fset $dbc_package/$dbc_dbtype/admin-pass seen false
-			db_fset $dbc_package/$dbc_dbtype/admin-pass2 seen false
 			db_input high $dbc_package/passwords-do-not-match || true
 			db_go || true
 		fi
@@ -434,20 +433,21 @@
 
 	# make sure the passwords are the same, safely
 	while [ ! "$have_app_pass" ]; do
+		# forget the password-confirm question first, as it's shared
+		db_reset $dbc_package/password-confirm
+		db_fset $dbc_package/password-confirm seen false
+
 		# get the appistrative password
 		db_input high $dbc_package/$dbc_dbtype/app-pass || true
 
-		# actually get the info
-		db_go || true
-		db_get $dbc_package/$dbc_dbtype/app-pass
-		pass1="$RET"
-
 		# get the password again
-		db_input high $dbc_package/$dbc_dbtype/app-pass2 || true
+		db_input high $dbc_package/password-confirm || true
 
-		# again, actually get it
+		# get the info
 		db_go || true
-		db_get $dbc_package/$dbc_dbtype/app-pass2
+		db_get $dbc_package/$dbc_dbtype/app-pass
+		pass1="$RET"
+		db_get $dbc_package/password-confirm
 		pass2="$RET"
 
 		# test to see if the passwords match
@@ -456,9 +456,7 @@
 		else
 			# tell them the passwords didn't match, loop again
 			db_reset $dbc_package/$dbc_dbtype/app-pass
-			db_reset $dbc_package/$dbc_dbtype/app-pass2
 			db_fset $dbc_package/$dbc_dbtype/app-pass seen false
-			db_fset $dbc_package/$dbc_dbtype/app-pass2 seen false
 			db_input high $dbc_package/passwords-do-not-match || true
 			db_go || true
 		fi



