fix python3 error and improve upgrade text
svn: r21868
This commit is contained in:
parent
7a7e95410a
commit
40db10e378
@ -171,7 +171,13 @@ class DbUpgradeRequiredError(Exception):
|
|||||||
Exception.__init__(self)
|
Exception.__init__(self)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return _("You cannot open this database without upgrading it.\n"
|
return _("The Family Tree structure has changed since the version of"
|
||||||
|
" Gramps you used to create this tree.\n\n"
|
||||||
|
"Therefore, you cannot open this Family Tree without upgrading the"
|
||||||
|
" definition of the structure.\n"
|
||||||
"If you upgrade then you won't be able to use previous "
|
"If you upgrade then you won't be able to use previous "
|
||||||
"versions of Gramps.\n"
|
"versions of Gramps!\n\n"
|
||||||
"You might want to make a backup copy first.")
|
"Upgrading is a difficult task that may not be interrupted, or "
|
||||||
|
"Gramps will irretrievably corrupt your tree. Therefore, create "
|
||||||
|
"a backup copy first. See: \n"
|
||||||
|
"http://www.gramps-project.org/wiki/index.php?title=How_to_make_a_backup")
|
||||||
|
@ -633,7 +633,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
|
|||||||
# self.secondary_connected flag should be set accordingly.
|
# self.secondary_connected flag should be set accordingly.
|
||||||
if self.need_schema_upgrade():
|
if self.need_schema_upgrade():
|
||||||
_LOG.debug("Schema upgrade required from %s to %s" %
|
_LOG.debug("Schema upgrade required from %s to %s" %
|
||||||
(self.metadata.get('version', default=0), _DBVERSION))
|
(self.metadata.get(b'version', default=0), _DBVERSION))
|
||||||
if force_schema_upgrade == True or force_bsddb_upgrade == True:
|
if force_schema_upgrade == True or force_bsddb_upgrade == True:
|
||||||
self.gramps_upgrade(callback)
|
self.gramps_upgrade(callback)
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user