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

[Matúš Kukan]

 solenv/bin/modules/installer/download.pm |   21 ++++-----------------
 solenv/bin/modules/installer/epmfile.pm  |    5 +++--
 2 files changed, 7 insertions(+), 19 deletions(-)

New commits:
commit 2b1fcd466eea63cd8e694693255b765c863fda8c
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 10 21:49:57 2013 +0100

    Add back check for missing libgetuid.so.
    
    If the library does not work, things like fdo#67388 happen.
    
    Change-Id: I3390fdb6f2cdf24145ddde4466146f91e5dfde82

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index d1e74bd..0fee1c7 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -192,7 +192,9 @@ sub call_sum
 
 sub get_path_for_library
 {
-    return $ENV{'WORKDIR'} . '/LinkTarget/Library/libgetuid.so';
+    my $getuidlibrary = $ENV{'WORKDIR'} . '/LinkTarget/Library/libgetuid.so';
+    if ( ! -e $getuidlibrary ) { installer::exiter::exit_program("File $getuidlibrary does not exist!", "get_path_for_library"); }
+    return $getuidlibrary;
 }
 
 #########################################################
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index dca6eea..b33aad1 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -794,8 +794,9 @@ sub set_patch_state
 
 sub get_ld_preload_string
 {
-    return 'LD_PRELOAD=' . $ENV{'WORKDIR'}
-        . '/LinkTarget/Library/libgetuid.so';
+    my $getuidlibrary = $ENV{'WORKDIR'} . '/LinkTarget/Library/libgetuid.so';
+    if ( ! -e $getuidlibrary ) { installer::exiter::exit_program("File $getuidlibrary does not exist!", "get_ld_preload_string"); }
+    return 'LD_PRELOAD=' . $getuidlibrary;
 }
 
 #################################################
commit 203e84d434de904add0b4426e87a4eb0a9a50c66
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 10 21:44:07 2013 +0100

    installer: Fix path to libgetuid.so again. Hardcode it.
    
    Hopefully fixes fdo#67388. I can't reproduce here.
    
    Change-Id: I5bcbb59a0f49e925d60f225b0f8f925d6d5dc468

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index b678bbf..d1e74bd 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -192,22 +192,7 @@ sub call_sum
 
 sub get_path_for_library
 {
-    my ($includepatharrayref) = @_;
-
-    my $getuidlibraryname = "libgetuid.so";
-
-    my $getuidlibraryref = "";
-
-    if ( $installer::globals::include_paths_read )
-    {
-        $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0);
-    }
-    else
-    {
-        $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$getuidlibraryname, $includepatharrayref, 0);
-    }
-
-    return $$getuidlibraryref;
+    return $ENV{'WORKDIR'} . '/LinkTarget/Library/libgetuid.so';
 }
 
 #########################################################
@@ -738,7 +723,7 @@ sub create_download_sets
 
         # getting the path of the getuid.so (only required for Solaris and Linux)
         my $getuidlibrary = "";
-        if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) { $getuidlibrary = get_path_for_library($includepatharrayref); }
+        if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) { $getuidlibrary = get_path_for_library(); }
 
         if ( $allvariableshashref->{'OOODOWNLOADNAME'} )
         {
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index c81ac99..dca6eea 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -795,7 +795,7 @@ sub set_patch_state
 sub get_ld_preload_string
 {
     return 'LD_PRELOAD=' . $ENV{'WORKDIR'}
-        . '/CustomTarget/setup_native/libgetuid.so';
+        . '/LinkTarget/Library/libgetuid.so';
 }
 
 #################################################