diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-10 21:49:57 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-11 08:50:46 +0100 |
| commit | 1e3f7a2a1ec604cb1f493ffa63ebc365044b0f4d (patch) | |
| tree | 12b0778f90a451c1cd1e51ac0b47e25a49bd097e /solenv | |
| parent | 1df62be82dc2b79521f4572f606dad778fe5684c (diff) | |
Add back check for missing libgetuid.so.
If the library does not work, things like fdo#67388 happen.
Change-Id: I3390fdb6f2cdf24145ddde4466146f91e5dfde82
(cherry picked from commit 2b1fcd466eea63cd8e694693255b765c863fda8c)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 4 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index d1e74bd93294..0fee1c7dc4d5 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 dca6eeacb563..b33aad152bd1 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; } ################################################# |