[Libreoffice-commits] core.git: 2 commits - scp2/source solenv/bin

[Matúš Kukan]

 scp2/source/python/file_python.scp          |    2 +-
 solenv/bin/modules/installer/scriptitems.pm |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit a01fabf7052df9b5d3921da4916bba6c05c4d6ac
Author: Matúš Kukan <matus.ku...@collabora.com>
Date:   Mon Dec 9 20:24:21 2013 +0100

    scp2: Fix one more 'Name' path.
    
    It is under #ifdef MINGW_SYSTEM_PYTHON, so nobody noticed.
    
    Change-Id: Idf48079e5533ef20fd37eef819c9ac2601833a14

diff --git a/scp2/source/python/file_python.scp 
b/scp2/source/python/file_python.scp
index 66e590d..fda0ba5 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -131,7 +131,7 @@ End
 // python_wrapper.exe
 File gid_File_Py_Bin_Python
     BIN_FILE_BODY;
-    Name = EXENAME(pyuno/python);
+    Name = EXENAME(python);
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
 End
commit 5015f04db460806a8247e97d9f1fe77f1501b255
Author: Matúš Kukan <matus.ku...@collabora.com>
Date:   Mon Dec 9 20:16:32 2013 +0100

    fdo#72451: installer: Make filelists work again.
    
    regression from c2f5e09900561d417d53a74fd6bc189cb7d898e1
    
    Change-Id: I840d066ec2fccb35fdbd96939c5593a71beb0abd

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index be1123d..3310951 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -874,7 +874,16 @@ sub get_Destination_Directory_For_Item_From_Directorylist  
     # this is used f
         elsif ((!( $ispredefinedprogdir )) && (!( $ispredefinedconfigdir )))
         {
             my $directorynameref = 
get_Directoryname_From_Directorygid($dirsarrayref, $searchdirgid, $onelanguage, 
$oneitemgid);
-            $destfilename = $$directorynameref . 
$installer::globals::separator . $oneitem->{'Name'};
+            my $styles = "";
+            if ($oneitem->{'Styles'}) { $styles = $oneitem->{'Styles'}; }
+            if ($styles =~ /\bFILELIST\b/)
+            {
+                $destfilename = $$directorynameref . 
$installer::globals::separator . $oneitemname;
+            }
+            else
+            {
+                $destfilename = $$directorynameref . 
$installer::globals::separator . $oneitem->{'Name'};
+            }
         }
         else
         {

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits