diff options
| -rw-r--r-- | solenv/bin/pack_images.py | 6 | ||||
| -rw-r--r-- | svtools/inc/bitmaps.hlst | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/solenv/bin/pack_images.py b/solenv/bin/pack_images.py index 5d368658961f..5ccc194e6307 100644 --- a/solenv/bin/pack_images.py +++ b/solenv/bin/pack_images.py @@ -342,7 +342,13 @@ def remove_links_from_zip_list(zip_list, links): for link in links.keys(): if link in zip_list: + module = zip_list[link] del zip_list[link] + # tdf#135369 if we removed something that is a link to a real file + # from our list of images to pack, but that real image is not in + # the list of images to pack, add it in instead now + if links[link] not in zip_list: + zip_list[links[link]] = module LOGGER.debug("Cleaned zip list:\n%s", "\n".join(zip_list)) diff --git a/svtools/inc/bitmaps.hlst b/svtools/inc/bitmaps.hlst index cb6a813eac61..35332e05ede0 100644 --- a/svtools/inc/bitmaps.hlst +++ b/svtools/inc/bitmaps.hlst @@ -123,5 +123,4 @@ #define BMP_TAB_LOCK "cmd/sc_lock.png" - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |