From ab15b855665e6b7a2c30fd40f28933e7de2bf289 Mon Sep 17 00:00:00 2001 From: Tim G L Lyons Date: Fri, 10 May 2013 09:25:27 +0000 Subject: [PATCH] Fix to incorrect svn merge in commit 22219 see 0006686: Wrong bsddb upgrade message given svn: r22238 --- gramps/cli/grampscli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gramps/cli/grampscli.py b/gramps/cli/grampscli.py index 0d7c858c5..81abd02d0 100644 --- a/gramps/cli/grampscli.py +++ b/gramps/cli/grampscli.py @@ -163,9 +163,9 @@ class CLIDbLoader(object): self._errordialog( _("Cannot open database"), str(msg)) except gen.db.exceptions.BsddbUpgradeRequiredError as msg: self.dbstate.no_database() - except gen.db.exceptions.BsddbDowngradeRequiredError, msg: - self.dbstate.no_database() self._errordialog( _("Cannot open database"), str(msg)) + except gen.db.exceptions.BsddbDowngradeRequiredError as msg: + self.dbstate.no_database() self._errordialog( _("Cannot open database"), str(msg)) except gen.db.exceptions.BsddbDowngradeError as msg: self.dbstate.no_database()