[Libreoffice-commits] online.git: kit/Kit.cpp

[Michael Meeks (via logerrit)]

 kit/Kit.cpp |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit eab1832b06f5da6533ba5ddd1eff714245729a25
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Apr 14 17:04:09 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Apr 14 18:57:38 2020 +0200

    tdf#132100 - don't copy debugsource into jails.
    
    gdb will take it from the system anyway, so it's just amazingly
    excessive weight wrapped in a performance problem.
    
    Change-Id: Ie8d7d2be97da64233a6d7cb4864d6ee88ea8c337
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92207
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 77c3d9e2b..5e28c0ca0 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -144,6 +144,7 @@ namespace
             return
                 strcmp(path, "program/wizards") != 0 &&
                 strcmp(path, "sdk") != 0 &&
+                strcmp(path, "debugsource") != 0 &&
                 strcmp(path, "share/basic") != 0 &&
                 strcmp(path, "share/Scripts/java") != 0 &&
                 strcmp(path, "share/Scripts/javascript") != 0 &&
@@ -163,8 +164,10 @@ namespace
             if (!dot)
                 return true;
 
-            if (!strcmp(dot, ".dbg") ||
-                !strcmp(dot, ".so"))
+            if (!strcmp(dot, ".dbg"))
+                return false;
+
+            if (!strcmp(dot, ".so"))
             {
                 // NSS is problematic ...
                 if (strstr(path, "libnspr4") ||