[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - solenv/bin

[Jan Holesovsky (via logerrit)]

 solenv/bin/pack_images.py |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

New commits:
commit b99780b1a1fa99d0c9f96f55677797a081477cb1
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Dec 17 12:24:53 2018 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Oct 9 10:34:06 2019 +0200

    postprocess: Some .svg images were missing previously.
    
    Change-Id: I6c42b1f94f6510e42049bc7c7fc040f17e6edae6
    Reviewed-on: https://gerrit.libreoffice.org/66773
    Tested-by: Jenkins
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/80259
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/solenv/bin/pack_images.py b/solenv/bin/pack_images.py
index 71e7b32741b8..0281f4430e1f 100644
--- a/solenv/bin/pack_images.py
+++ b/solenv/bin/pack_images.py
@@ -518,18 +518,16 @@ def parse_image_list(imagelist_filenames):
 
                     if line.startswith('%GLOBALRES%'):
                         key = "res/%s" % line.replace('%GLOBALRES%/', '')
-                        if key in global_image_list:
-                            global_image_list[key] += 1
-                        else:
-                            global_image_list[key] = 0
+                        global_image_list[key] = True
+                        if key.endswith('.png'):
+                            global_image_list[key[:-4] + '.svg'] = True
                         continue
 
                     if line.startswith('%MODULE%'):
                         key = line.replace('%MODULE%/', '')
-                        if key in module_image_list:
-                            module_image_list[key] += 1
-                        else:
-                            module_image_list[key] = 0
+                        module_image_list[key] = True
+                        if key.endswith('.png'):
+                            module_image_list[key[:-4] + '.svg'] = True
                         continue
 
                     LOGGER.error("Cannot parse line %s:%d", imagelist_filename, line_count)