diff --git a/product/ERP5Type/Globals.py b/product/ERP5Type/Globals.py index 8bd0d8e218e81d2dcef4cbcc67827a645f966cb9..cf1c15bc76382407f214ab098c408970ae6d6178 100644 --- a/product/ERP5Type/Globals.py +++ b/product/ERP5Type/Globals.py @@ -67,7 +67,11 @@ _cfg = _getConfiguration() DevelopmentMode = _cfg.debug_mode # backward compatibility INSTANCE_HOME = _cfg.instancehome -SOFTWARE_HOME = _cfg.softwarehome +try: + SOFTWARE_HOME = _cfg.softwarehome +except AttributeError: + # Not present when imported from ZEO (for conflict resolution). + pass # don't tempt potential users by leaving these lying around del _cfg, _getConfiguration