[Dbconfig-common-devel] dbconfig-common/debian changelog,1.41,1.42 dbconfig-common.templates,1.18,1.19

[seanius@haydn.debian.org]

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

Modified Files:
	changelog dbconfig-common.templates 
Log Message:
- some template wording changes for the install/upgrade/remove error messages
- install/remove/error functions return instead of exit
- cosmetic (indentation) stuff


Index: changelog
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/changelog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- changelog	11 May 2005 00:32:37 -0000	1.41
+++ changelog	14 May 2005 17:50:47 -0000	1.42
@@ -1,5 +1,8 @@
 dbconfig-common (1.8.2) UNRELEASED; urgency=low
 
+  * Miguel Gea Milvaques:
+    - Initial support for an abort/retry option when something goes
+      wrong in the install, upgrade, or remove operations.
   * Translations:
     - typographical fix in one of the templates, thanks to Clytie Siddall
       (closes: #308423).

Index: dbconfig-common.templates
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/dbconfig-common.templates,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dbconfig-common.templates	13 May 2005 16:04:33 -0000	1.18
+++ dbconfig-common.templates	14 May 2005 17:50:48 -0000	1.19
@@ -106,54 +106,53 @@
 Type: select
 Choices: abort, retry
 Default: abort
-_Description: Error upgrading database for ${pkg}.
+_Description: Error upgrading database for ${pkg}.  Retry?
  An error seems to have occurred while upgrading the database.
+ If it's of any help, this was the error encountered:
+ .
+ ${error}
  .
  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:
- .
- ${error}
+ At this point, you have the option to retry or abort the operation.
+ If you choose "retry", another attempt will be made at performing the
+ upgrade.  If you choose "abort", the upgrade will fail and you will
+ need to downgrade, reinstall, or reconfigure this package, or otherwise
+ manually intervene to continue using ${pkg}.
 
 Template: dbconfig-common/install-error
 Type: select
 Choices: abort, retry
 Default: abort
-_Description: Error installing database for ${pkg}.
+_Description: Error installing database for ${pkg}.  Retry?
  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}
+ .
+ Choose "retry" if you would like to immediately attempt the installation
+ again, or choose "abort" if you would like to try again later.
 
 Template: dbconfig-common/remove-error
 Type: select
 Choices: abort, retry
 Default: abort
-_Description: Error removing database for ${pkg}.
+_Description: Error removing database for ${pkg}.  Retry?
  An error seems to have occurred while removing the database.
  .
  For some reason it was not possible to perform some of the actions necessary
  to remove the database for ${pkg}.  At this point you have two options: you
  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:
+ have to remove the database manually).  If it's of any help, this was
+ the error encountered:
  .
  ${error}
+ .
+ If you choose "retry", another attempt will be made at removing the
+ package's database.  If you choose "abort", it will be up to you
+ to remove anything left behind.
 
 Template: dbconfig-common/remote/host
 Type: select