Yedidyah Bar David has uploaded a new change for review.
Change subject: packaging: setup: clean '&' in jdbcTlsOptions
......................................................................
packaging: setup: clean '&' in jdbcTlsOptions
Without this change, we might get an '&' immediately after the '?' in
ENGINE_DB_URL.
Change-Id: If8bb485e03c9d9d4c967f763a157151b11cbb84d
Signed-off-by: Yedidyah Bar David <d...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/config/database.py
1 file changed, 14 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/20361/1
diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/database.py
b/packaging/setup/plugins/ovirt-engine-setup/config/database.py
index 8724e89..308c97a 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/config/database.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/config/database.py
@@ -87,19 +87,21 @@
securedValidation=self.environment[
osetupcons.DBEnv.SECURED_HOST_VALIDATION
],
- jdbcTlsOptions='%s%s' % (
+ jdbcTlsOptions='&'.join(
+ s for s in
+ (
+ 'ssl=true'
+ if self.environment[
+ osetupcons.DBEnv.SECURED
+ ] else '',
- 'ssl=true'
- if self.environment[
- osetupcons.DBEnv.SECURED
- ] else '',
-
- '&sslfactory=org.postgresql.ssl.NonValidatingFactory'
- if not self.environment[
- osetupcons.DBEnv.SECURED_HOST_VALIDATION
- ] else ''
-
- )
+
'sslfactory=org.postgresql.ssl.NonValidatingFactory'
+ if not self.environment[
+ osetupcons.DBEnv.SECURED_HOST_VALIDATION
+ ] else ''
+ )
+ if s
+ ),
),
modifiedList=self.environment[
otopicons.CoreEnv.MODIFIED_FILES
--
To view, visit http://gerrit.ovirt.org/20361
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8bb485e03c9d9d4c967f763a157151b11cbb84d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yedidyah Bar David <d...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
