Alon Bar-Lev has uploaded a new change for review.

Change subject: packaging: setup: quote database variables
......................................................................

packaging: setup: quote database variables

best to quote anything, especially if it contains special characters
such as '&'.

Related-To: https://bugzilla.redhat.com/show_bug.cgi?id=1002401
Change-Id: I8c05822580656e9b98d029fa39e8b37caf5b5736
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/config/database.py
1 file changed, 10 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/20441/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..542441a 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/config/database.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/config/database.py
@@ -59,19 +59,21 @@
                 owner=self.environment[osetupcons.SystemEnv.USER_ENGINE],
                 enforcePermissions=True,
                 content=(
-                    'ENGINE_DB_HOST={host}\n'
-                    'ENGINE_DB_PORT={port}\n'
-                    'ENGINE_DB_USER={user}\n'
+                    'ENGINE_DB_HOST="{host}"\n'
+                    'ENGINE_DB_PORT="{port}"\n'
+                    'ENGINE_DB_USER="{user}"\n'
                     'ENGINE_DB_PASSWORD="{password}"\n'
-                    'ENGINE_DB_DATABASE={db}\n'
-                    'ENGINE_DB_SECURED={secured}\n'
-                    'ENGINE_DB_SECURED_VALIDATION={securedValidation}\n'
-                    'ENGINE_DB_DRIVER=org.postgresql.Driver\n'
+                    'ENGINE_DB_DATABASE="{db}"\n'
+                    'ENGINE_DB_SECURED="{secured}"\n'
+                    'ENGINE_DB_SECURED_VALIDATION="{securedValidation}"\n'
+                    'ENGINE_DB_DRIVER="org.postgresql.Driver"\n'
                     'ENGINE_DB_URL=' + (
+                        '"'
                         'jdbc:postgresql://'
                         '${{ENGINE_DB_HOST}}:${{ENGINE_DB_PORT}}'
                         '/${{ENGINE_DB_DATABASE}}'
-                        '?{jdbcTlsOptions}\n'
+                        '?{jdbcTlsOptions}'
+                        '"\n'
                     ) +
                     ''
                 ).format(


-- 
To view, visit http://gerrit.ovirt.org/20441
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c05822580656e9b98d029fa39e8b37caf5b5736
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to