[Dbconfig-common-devel] dbconfig-common/debian dbconfig-common.templates,1.17,1.18

[xerakko-guest@haydn.debian.org]

Update of /cvsroot/dbconfig-common/dbconfig-common/debian
In directory haydn:/tmp/cvs-serv24209/debian

Modified Files:
	dbconfig-common.templates 
Log Message:


Initial works on retry/abort when install/upgrade/remove fails


Index: dbconfig-common.templates
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/dbconfig-common.templates,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- dbconfig-common.templates	11 May 2005 00:32:37 -0000	1.17
+++ dbconfig-common.templates	13 May 2005 16:04:33 -0000	1.18
@@ -64,7 +64,6 @@
 Template: dbconfig-common/database-type
 Type: select
 Choices: ${database_types}
-Default: 
 _Description: Database type to be used by ${pkg}:
  ${pkg} can be configured to use one of many database types.
  Below, you will be presented with the available choices.
@@ -104,13 +103,17 @@
  The passwords you supplied do not match.  Please try again.
 
 Template: dbconfig-common/upgrade-error
-Type: note
+Type: select
+Choices: abort, retry
+Default: abort
 _Description: Error upgrading database for ${pkg}.
  An error seems to have occurred while upgrading the database.
  .
  Fortunately, there should be a backup of the database made just before
  the upgrade in ${dbfile}.
  .
+ Do you want to abort to try it or retry again?
+ .
  At this point, you will need to downgrade, reinstall, or reconfigure
  this package, or otherwise manually intervene to continue using ${pkg}
  If it's of any help, this was the error encountered:
@@ -118,18 +121,25 @@
  ${error}
 
 Template: dbconfig-common/install-error
-Type: note
+Type: select
+Choices: abort, retry
+Default: abort
 _Description: Error installing database for ${pkg}.
  An error seems to have occurred while installing the database.
  .
  At this point, you will need to reinstall or reconfigure ${pkg},
  or otherwise manually intervene before it will be of any use.
+ .
+ Do you want to abort to try it or retry again?
+ .
  If it's of any help, this was the error encountered:
  .
  ${error}
 
 Template: dbconfig-common/remove-error
-Type: note
+Type: select
+Choices: abort, retry
+Default: abort
 _Description: Error removing database for ${pkg}.
  An error seems to have occurred while removing the database.
  .
@@ -138,6 +148,8 @@
  can find out what has caused this error and fix it, or you can refuse
  the offer for help removing the database (the latter implies you will
  have to remove the database manually).
+ .
+ Do you want to abort to try it or retry again?
  .
  If it's of any help, this was the error encountered:
  .