b1bd9f
From 3a827091172b9ce3982323b838ed55d896d585d4 Mon Sep 17 00:00:00 2001
b1bd9f
From: Stephan Bergmann <sbergman@redhat.com>
b1bd9f
Date: Sat, 3 Aug 2019 16:37:48 +0100
b1bd9f
Subject: [PATCH 3/3] keep name percent-encoded
b1bd9f
MIME-Version: 1.0
b1bd9f
Content-Type: text/plain; charset=UTF-8
b1bd9f
Content-Transfer-Encoding: 8bit
b1bd9f
b1bd9f
Change-Id: I470c4b24192c3e3c9b556a9bbb3b084359e0033b
b1bd9f
Reviewed-on: https://gerrit.libreoffice.org/77006
b1bd9f
Tested-by: Jenkins
b1bd9f
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
b1bd9f
Tested-by: Caolán McNamara <caolanm@redhat.com>
b1bd9f
(cherry picked from commit 315c51731384230194af26b86a976bf5d06c9dcc)
b1bd9f
Reviewed-on: https://gerrit.libreoffice.org/77090
b1bd9f
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
b1bd9f
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
b1bd9f
---
b1bd9f
 scripting/source/pyprov/pythonscript.py | 4 +++-
b1bd9f
 1 file changed, 3 insertions(+), 1 deletion(-)
b1bd9f
b1bd9f
diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py
b1bd9f
index f1b2bfc75ee3..64e1337d642e 100644
b1bd9f
--- a/scripting/source/pyprov/pythonscript.py
b1bd9f
+++ b/scripting/source/pyprov/pythonscript.py
b1bd9f
@@ -219,7 +219,9 @@ class MyUriHelper:
b1bd9f
 
b1bd9f
             # path to the .py file + "$functionname, arguments, etc
b1bd9f
             xStorageUri = self.m_uriRefFac.parse(scriptURI)
b1bd9f
-            sStorageUri = xStorageUri.getName().replace( "|", "/" );
b1bd9f
+            # getName will apply url-decoding to the name, so encode back
b1bd9f
+            sStorageUri = xStorageUri.getName().replace("%", "%25")
b1bd9f
+            sStorageUri = sStorageUri.replace( "|", "/" )
b1bd9f
 
b1bd9f
             # path to the .py file, relative to the base
b1bd9f
             sFileUri = sStorageUri[0:sStorageUri.find("$")]
b1bd9f
-- 
b1bd9f
2.21.0
b1bd9f