Commit 86ef0009 authored by Vincent Pelletier's avatar Vincent Pelletier

softwarehome is not present on _cfg on SlapOS setups.

This problem was triggered by allowing ZEO to import non-packaged products,
and trying to resolve a conflict on
Products.ERP5Type.Utils.ScalarMaxConflictResolver, which imports Globals.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45757 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3efacd9a
...@@ -67,7 +67,11 @@ _cfg = _getConfiguration() ...@@ -67,7 +67,11 @@ _cfg = _getConfiguration()
DevelopmentMode = _cfg.debug_mode DevelopmentMode = _cfg.debug_mode
# backward compatibility # backward compatibility
INSTANCE_HOME = _cfg.instancehome 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 # don't tempt potential users by leaving these lying around
del _cfg, _getConfiguration del _cfg, _getConfiguration
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment