[Libreoffice-commits] Revert "installer: Use hashref for replace_all_ziplistvariables_in_rtffile"

[Tim Retout]

On Aug 23, 2012 9:13 AM, "Stephan Bergmann" <sbergman at redhat.com> wrote:
>
> On 08/23/2012 09:59 AM, Libreoffice Gerrit user wrote:
>>
>> commit 52755d6d2cf1c6addaf3c91b93bb86d66b730409
>> Author: Stephan Bergmann <sbergman at redhat.com>
>> Date:   Thu Aug 23 09:47:13 2012 +0200
>>
>>      Revert "installer: Use hashref for
replace_all_ziplistvariables_in_rtffile"
>>
>>      This reverts commit 46a977081c6f1886f8fff8457c85e6d426dcc20f.  It
started to
>>      replace occurrences of "${...}" unknown to the installer with empty
strings,
>>      instead of keeping them as-is.  This caused the "${ORIGIN}" at the
start of the
>>      value for URE_BOOTSTRAP to disappear from the soffice ini-file (cf.
>>      gid_Brand_Profileitem_Soffice_UreBootstrap in
scp2/source/ooo/common_brand.scp),
>>      making soffice fail to start completely.

> Needed to revert, see above.  The original situation of how the installer
Perl code (we have no good name to talk about it, btw) does string
replacements was never really satisfactory to begin with, replacing just
those "${abc}" it happens to recognize (i.e., that are defined in
instsetoo_native/util/openoffice.lst, IIUC) and leaving unknown ones (like
"${ORIGIN}") alone.

Oh dear, sorry. :(  I could quite easily modify the patch to restore that
behaviour... and I'd add a test for it.  But I can see that it's not ideal
- if ORIGIN gets added to openoffice.lst, it will still fall over.

> A much more robust approach would be to specify an escape mechanism
(either "\$" to quote "$" and "\\" to quote "\", or "$$" to quote "$", say)
in the input language of the installer code.  But doing so would mean that
all the existing input text needs to be reviewed, adding escapements
exactly where necessary.

Hmm. And then these would need unescaping.

...
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120823/f6d6993b/attachment-0001.html>