8483: db upgrade fails, fatal damage
This commit is contained in:
		
				
					committed by
					
						
						Paul Franklin
					
				
			
			
				
	
			
			
			
						parent
						
							a02c68edfb
						
					
				
				
					commit
					4bd5faf446
				
			@@ -47,7 +47,7 @@ from .constfunc import get_env_var, conv_to_unicode
 | 
				
			|||||||
#
 | 
					#
 | 
				
			||||||
#-------------------------------------------------------------------------
 | 
					#-------------------------------------------------------------------------
 | 
				
			||||||
PROGRAM_NAME   = "Gramps"
 | 
					PROGRAM_NAME   = "Gramps"
 | 
				
			||||||
from ..version import VERSION, VERSION_TUPLE, major_version
 | 
					from gramps.version import VERSION, VERSION_TUPLE, major_version
 | 
				
			||||||
#-------------------------------------------------------------------------
 | 
					#-------------------------------------------------------------------------
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Standard GRAMPS Websites
 | 
					# Standard GRAMPS Websites
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -31,7 +31,7 @@ import libxslt
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
from gramps.plugins.lib.libgrampsxml import GRAMPS_XML_VERSION
 | 
					from gramps.plugins.lib.libgrampsxml import GRAMPS_XML_VERSION
 | 
				
			||||||
from ...const import ROOT_DIR, USER_PLUGINS
 | 
					from ...const import ROOT_DIR, USER_PLUGINS
 | 
				
			||||||
from ....version import VERSION
 | 
					from gramps.version import VERSION
 | 
				
			||||||
from ...lib import Name, Surname
 | 
					from ...lib import Name, Surname
 | 
				
			||||||
from ...const import GRAMPS_LOCALE as glocale
 | 
					from ...const import GRAMPS_LOCALE as glocale
 | 
				
			||||||
_ = glocale.translation.sgettext
 | 
					_ = glocale.translation.sgettext
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,7 +40,7 @@ import io
 | 
				
			|||||||
# GRAMPS modules
 | 
					# GRAMPS modules
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
#-------------------------------------------------------------------------
 | 
					#-------------------------------------------------------------------------
 | 
				
			||||||
from ...version import VERSION as GRAMPSVERSION, VERSION_TUPLE
 | 
					from gramps.version import VERSION as GRAMPSVERSION, VERSION_TUPLE
 | 
				
			||||||
from ..const import IMAGE_DIR
 | 
					from ..const import IMAGE_DIR
 | 
				
			||||||
from ..const import GRAMPS_LOCALE as glocale
 | 
					from ..const import GRAMPS_LOCALE as glocale
 | 
				
			||||||
_ = glocale.translation.gettext
 | 
					_ = glocale.translation.gettext
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -47,7 +47,7 @@ LOG = logging.getLogger(".gen.plug")
 | 
				
			|||||||
#-------------------------------------------------------------------------
 | 
					#-------------------------------------------------------------------------
 | 
				
			||||||
from ._pluginreg import make_environment
 | 
					from ._pluginreg import make_environment
 | 
				
			||||||
from ..const import USER_PLUGINS
 | 
					from ..const import USER_PLUGINS
 | 
				
			||||||
from ...version import VERSION_TUPLE
 | 
					from gramps.version import VERSION_TUPLE
 | 
				
			||||||
from . import BasePluginManager
 | 
					from . import BasePluginManager
 | 
				
			||||||
from ..utils.configmanager import safe_eval
 | 
					from ..utils.configmanager import safe_eval
 | 
				
			||||||
from ..config import config
 | 
					from ..config import config
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user