From 92e084fcf7a856143158b5e9026937be746e06ab Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Wed, 17 Jun 2015 06:34:16 -0400 Subject: [PATCH] 8614: addresses pickleupgrade.txt issue, by kulath --- gramps/plugins/database/bsddb_support/write.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gramps/plugins/database/bsddb_support/write.py b/gramps/plugins/database/bsddb_support/write.py index 2eb665ac5..4496128ad 100644 --- a/gramps/plugins/database/bsddb_support/write.py +++ b/gramps/plugins/database/bsddb_support/write.py @@ -686,8 +686,11 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback): # Check for pickle upgrade versionpath = os.path.join(self.path, str(PCKVERSFN)) - if not os.path.isfile(versionpath) and \ - not self.readonly and not self.update_pickle_version: + # Up to gramps 3.4.x PCKVERSFN was not written + # Gramps 4.2 incorrectly wrote PCKVERSFN = 'Yes' for Python2, so check + # whether python is upgraded + if ((not self.readonly and not self.update_pickle_version) and + (not os.path.isfile(versionpath) or self.update_python_version)): _LOG.debug("Make backup in case there is a pickle upgrade") self.__make_zip_backup(name) self.update_pickle_version = True