[Dbconfig-common-changes] [dbconfig-common] r338 - in trunk: debian dpkg

[Sean Finney]

Author: seanius
Date: 2006-10-10 09:42:34 +0000 (Tue, 10 Oct 2006)
New Revision: 338

Modified:
   trunk/debian/changelog
   trunk/dpkg/prerm
Log:
purging question not when install=false

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-10-10 09:31:03 UTC (rev 337)
+++ trunk/debian/changelog	2006-10-10 09:42:34 UTC (rev 338)
@@ -1,10 +1,12 @@
 dbconfig-common (1.8.25) UNRELEASED; urgency=high
 
   * fixed bugs found by Finn Smith:
-    - multidbtype packages would fail to install if the user declined 
+    - multidbtype packages would fail to install if the admin declined 
       our help (closes: #391160).
     - preseed values for dbc_authmethod_foo were being ignored for
       multidbtype packages (closes: #391997).
+    - don't bother offering our assistance at purge time if the admin
+      never opted for our help in the first place.
   * previous version hasn't made it to testing, <=> urgency stays high.
 
  -- sean finney <seanius at debian.org>  Tue, 10 Oct 2006 11:30:34 +0200

Modified: trunk/dpkg/prerm
===================================================================
--- trunk/dpkg/prerm	2006-10-10 09:31:03 UTC (rev 337)
+++ trunk/dpkg/prerm	2006-10-10 09:42:34 UTC (rev 338)
@@ -24,9 +24,14 @@
 
 	if [ "$dbc_command" = "remove" ] && [ ! "$dbc_frontend" ]; then
 		###
+		### if they didn't want our help installing,  we should assume
+		### they don't want our help removing either
+		###
+		if [ "$dbc_install" != "true" ]; then return 0; fi
+
+		###
 		### ask the admin if we should help with removal
 		###
-		
 		if [ "$dbc_remove" ]; then 
 			db_set $dbc_package/dbconfig-remove "$dbc_remove"
 		fi