Commit 7de67ba6 authored by Jim Fulton's avatar Jim Fulton

Ugh. We can't simply disable product initialization when running a ZEO

client, we just need to prevent database updates. We now do this using
an abort.
parent 0006e835
...@@ -409,7 +409,6 @@ def initializeProduct(productp, name, home, app): ...@@ -409,7 +409,6 @@ def initializeProduct(productp, name, home, app):
try: try:
if ihasattr(products,name): if ihasattr(products,name):
old=getattr(products, name) old=getattr(products, name)
if os.environ.get('ZEO_CLIENT',''): return old
if (ihasattr(old,'version') and old.version==fver and if (ihasattr(old,'version') and old.version==fver and
hasattr(old, 'import_error_') and hasattr(old, 'import_error_') and
old.import_error_==ie): old.import_error_==ie):
...@@ -456,6 +455,8 @@ def initializeProduct(productp, name, home, app): ...@@ -456,6 +455,8 @@ def initializeProduct(productp, name, home, app):
{'label':'README', 'action':'manage_readme'}, {'label':'README', 'action':'manage_readme'},
) )
if os.environ.get('ZEO_CLIENT',''): get_transaction().abort()
return product return product
def ihasattr(o, name): def ihasattr(o, name):
......
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