Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restored ability to use own explicit version of zodb-temporary-storage. #160

Merged
merged 2 commits into from
Jan 18, 2021
Merged

Restored ability to use own explicit version of zodb-temporary-storage. #160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b15c68
Restored ability to use own explicit version of zodb-temporary-storage.
mauritsvanrees Jan 12, 2021
8179b10
Added more tests for zodb-temporary-storage option.
mauritsvanrees Jan 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions news/93.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Restored ability to use own explicit version of zodb-temporary-storage.
[maurits]
4 changes: 3 additions & 1 deletion src/plone/recipe/zope2instance/recipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,8 +661,10 @@ def is_rs_option(name):

zodb_tmp_storage = options.get('zodb-temporary-storage', 'on')
if zodb_tmp_storage.lower() in ('off', 'false', '0'):
# no temporary-storage snippet
zodb_tmp_storage = ''
else:
elif zodb_tmp_storage.lower() in ('on', 'true', '1'):
# use default temporary-storage snippet
zodb_tmp_storage = zodb_temporary_storage_template
template = wsgi_conf_template if self.wsgi else zope_conf_template

Expand Down