[Libreoffice-commits] dev-tools.git: esc-reporting/esc-collect.py

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Aug 16 20:54:00 UTC 2018


 esc-reporting/esc-collect.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 14a923c94f8b669ac9284de768c61692bc3950db
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu Aug 16 22:51:55 2018 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu Aug 16 22:53:25 2018 +0200

    ESC: json doesn't like backslashes
    
    See author in https://cgit.freedesktop.org/libreoffice/core/commit/?id=8055f402dbe6783884a51c8a78f4abcf7adda6c4

diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index 2216bf8..e4242d6 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -650,7 +650,8 @@ def get_git(cfg):
       os.system('(cd ' + basedir + repo['dir'] + ";git log --pretty=format:'" + useFormat + "') > /tmp/git.log")
       fp = open('/tmp/git.log', encoding='utf-8')
       while True:
-        x = fp.readline()
+        # Json fails if there's a backslash somewhere in the git log
+        x = fp.readline().replace("\\", "/")
         if x is None or x == '':
           break
         row = json.loads(x)


More information about the Libreoffice-commits mailing list