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

Stephan Bergmann sbergman at redhat.com
Tue Feb 12 00:18:31 PST 2013


 solenv/bin/modules/installer/download.pm |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 9b2a01c1ca59ab88cf0f947a3d265c0e7d165340
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 12 09:12:29 2013 +0100

    A missing getuid.so is not fatal
    
    ...all the places that would LD_PRELOAD it check for it being set anyway.
    
    Change-Id: I7937771e635654ae370e4f57ea9fa783ae7dad7f

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 0f62eaa..56606e8 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -216,8 +216,6 @@ sub get_path_for_library
         $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$getuidlibraryname, $includepatharrayref, 0);
     }
 
-    if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); }
-
     return $$getuidlibraryref;
 }
 
commit 9a38118b12113579a2eb8c794f9dddd7db27e992
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 12 09:16:29 2013 +0100

    call_sum has only one parameter
    
    Change-Id: Ib8925506c3ea08f2166483b9e902484ef8dd60f6

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index ca39a96..0f62eaa 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -165,7 +165,7 @@ sub put_checksum_and_size_into_script
 
 sub call_sum
 {
-    my ($filename, $getuidlibrary) = @_;
+    my ($filename) = @_;
 
     my $systemcall = "/usr/bin/sum $filename |";
 


More information about the Libreoffice-commits mailing list