[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configmgr/source

[Michael Meeks]

 configmgr/source/components.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4db6de9b83d3aaaf33fc7ecc936e0a6324ca92a3
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Feb 7 12:27:54 2017 +0100

    configmgr: add SAL_CONFIG_WINREG_RETAIN_TMP variable.
    
    Windows registry dumping behaves very strangely, and in hard to debug
    ways - this should help in-the-field debugging of this in future.
    
    Reviewed-on: https://gerrit.libreoffice.org/33992
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit e5b062758950b0d6c5cea0a1914998433ef19774)
    
    Change-Id: Ia35d58a8be36d1b683db39ae7d2128a3ccfd10a5

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index c0ad6f2..bfce2b6 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -561,7 +561,8 @@ Components::Components(
             OUString aTempFileURL;
             if (dumpWindowsRegistry(&aTempFileURL, eType)) {
                 parseFileLeniently(&parseXcuFile, aTempFileURL, layer, 0, 0, 0);
-                osl::File::remove(aTempFileURL);
+                if (!getenv("SAL_CONFIG_WINREG_RETAIN_TMP"))
+                    osl::File::remove(aTempFileURL);
             }
             ++layer; //TODO: overflow
 #endif