[Libreoffice-commits] .: solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/modules/installer.pm |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bae7ec75a1ce284a713c446ed2b4b05299a96f13
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Nov 14 11:28:17 2012 +0100

    do not remove logging directory under hands
    
    the installer is called several times for langpacks and helppacks
    in parallel; it has removed the whole toplevel logging directory
    and the logging failed
    
    better solution would be to remove only the lang-specific subdirectories;
    well, the installer removed only emptry directories in the past, see
    2584a460b5e560fce8719879414311b16b2c63d9
    
    Change-Id: I9dc9591346c7447677f46bca15085a3877e067ce

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 4c50d3b..76455f1 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -182,7 +182,9 @@ sub run {
     ########################################################
 
     my $oldloggingdir = $loggingdir;
-    installer::systemactions::remove_complete_directory($oldloggingdir);
+    # FIXME: It would be better to use installer::systemactions::remove_complete_directory
+    #        Though, we would need to remove only the lang-specific subdirectory for langpacks and helppacks
+    rmdir $oldloggingdir;
     $loggingdir = installer::systemactions::create_directories("logging", "");
     $loggingdir = $loggingdir . $installer::globals::separator;
     $installer::globals::exitlog = $loggingdir;