Commit 6f75b301 authored by Levin Zimmermann's avatar Levin Zimmermann

stack/erp5/WCFS+NEO: Fix query/separator identifier in URI constructor

We only need one query identifier ('?'), while query options should be
separated by the separator identifier ('&'). This essentially changes
the resulting NEO URI from

  neo://cluster@IP&a=b?b=c

to

  neo://cluster@IP?a=b&b=c
parent e82ad15f
......@@ -102,4 +102,4 @@ md5sum = 5cf0316fdd17a940031e4083bbededd8
[instance-wcfs.cfg.in]
filename = instance-wcfs.cfg.in
md5sum = 36a5adc0fb9756836ee31def4084a088
md5sum = de1583217645dd4b94c41cac16cc3d67
......@@ -19,7 +19,7 @@
{% do argv.append('%s=%s' % (k,v)) -%}
{% endfor -%}
{% if len(argv) > 0 -%}
{% set zurl = zurl + '&' + '?'.join(argv) -%}
{% set zurl = zurl + '?' + '&'.join(argv) -%}
{% endif -%}
{% else -%}
{% do assert(False, ("unsupported ZODB type", zodb)) -%}
......
......@@ -106,4 +106,4 @@ md5sum = 5cf0316fdd17a940031e4083bbededd8
[instance-wcfs.cfg.in]
filename = instance-wcfs.cfg.in
md5sum = 36a5adc0fb9756836ee31def4084a088
md5sum = de1583217645dd4b94c41cac16cc3d67
......@@ -19,7 +19,7 @@
{% do argv.append('%s=%s' % (k,v)) -%}
{% endfor -%}
{% if len(argv) > 0 -%}
{% set zurl = zurl + '&' + '?'.join(argv) -%}
{% set zurl = zurl + '?' + '&'.join(argv) -%}
{% endif -%}
{% else -%}
{% do assert(False, ("unsupported ZODB type", zodb)) -%}
......
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