[Dbconfig-common-changes] [dbconfig-common] r322 - trunk/dpkg

[Matt Brown]

Author: mattb-guest
Date: 2006-08-31 12:55:06 +0000 (Thu, 31 Aug 2006)
New Revision: 322

Modified:
   trunk/dpkg/common
Log:
Add error handling to avoid causing a fatal error in the database cleanup if an admin password was never set.


Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common	2006-08-29 14:46:28 UTC (rev 321)
+++ trunk/dpkg/common	2006-08-31 12:55:06 UTC (rev 322)
@@ -635,10 +635,10 @@
 dbc_forget_dbadmin_password(){
 	dbc_debug "dbc_forget_dbadmin_password() $@"
 	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/password-confirm
-	db_fset $dbc_package/password-confirm seen false 
+	db_reset $dbc_package/$dbc_dbtype/admin-pass || true
+	db_fset $dbc_package/$dbc_dbtype/admin-pass seen false || true
+	db_reset $dbc_package/password-confirm || true
+	db_fset $dbc_package/password-confirm seen false || true
 }
 
 ##