[openoffice] branch AOO418 updated: Be safe when checking FAKEROOT

[jim]

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO418 by this push:
     new 43c75f1  Be safe when checking FAKEROOT
43c75f1 is described below

commit 43c75f1d068f8e69f57d055e6d8a8fc2b9ad3743
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Wed Oct 28 10:29:28 2020 -0400

    Be safe when checking FAKEROOT
    
    (cherry picked from commit dfe9974f00bbfbbbe3454d83e54146dac7779823)
---
 main/solenv/bin/modules/installer/download.pm | 6 +++---
 main/solenv/bin/modules/installer/epmfile.pm  | 2 +-
 main/solenv/bin/modules/installer/worker.pm   | 4 ++--
 main/sysui/desktop/debian/makefile.mk         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/main/solenv/bin/modules/installer/download.pm 
b/main/solenv/bin/modules/installer/download.pm
index b2f7e32..64fb417 100644
--- a/main/solenv/bin/modules/installer/download.pm
+++ b/main/solenv/bin/modules/installer/download.pm
@@ -304,7 +304,7 @@ sub tar_package
 
        my $ldpreloadstring = "";
 
-       if ($ENV{'FAKEROOT'} ne "") {
+       if (($ENV{'FAKEROOT'} ne "no") && ($ENV{'FAKEROOT'} ne "")) {
                $ldpreloadstring = $ENV{'FAKEROOT'};
        } else {
                if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" 
. $getuidlibrary; }
@@ -375,7 +375,7 @@ sub create_tar_gz_file_from_package
 
        my $ldpreloadstring = "";
 
-       if ($ENV{'FAKEROOT'} ne "") {
+       if (($ENV{'FAKEROOT'} ne "no") && ($ENV{'FAKEROOT'} ne "")) {
                $ldpreloadstring = $ENV{'FAKEROOT'};
        } else {
                if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" 
. $getuidlibrary; }
@@ -807,7 +807,7 @@ sub create_tar_gz_file_from_directory
 
        my $ldpreloadstring = "";
 
-       if ($ENV{'FAKEROOT'} ne "") {
+       if (($ENV{'FAKEROOT'} ne "no") && ($ENV{'FAKEROOT'} ne "")) {
                $ldpreloadstring = $ENV{'FAKEROOT'};
        } else {
                if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" 
. $getuidlibrary; }
diff --git a/main/solenv/bin/modules/installer/epmfile.pm 
b/main/solenv/bin/modules/installer/epmfile.pm
index fb33fff..3845736 100644
--- a/main/solenv/bin/modules/installer/epmfile.pm
+++ b/main/solenv/bin/modules/installer/epmfile.pm
@@ -891,7 +891,7 @@ sub get_ld_preload_string
 
        my $getuidlibraryref = 
installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname,
 $includepatharrayref, 0);
 
-       if ($ENV{'FAKEROOT'} ne "") {
+       if (($ENV{'FAKEROOT'} ne "no") && ($ENV{'FAKEROOT'} ne "")) {
 
                $ldpreloadstring = $ENV{'FAKEROOT'};
 
diff --git a/main/solenv/bin/modules/installer/worker.pm 
b/main/solenv/bin/modules/installer/worker.pm
index cd1a427..41b4b02 100644
--- a/main/solenv/bin/modules/installer/worker.pm
+++ b/main/solenv/bin/modules/installer/worker.pm
@@ -3200,7 +3200,7 @@ sub tar_package
 
        my $ldpreloadstring = "";
 
-       if ($ENV{'FAKEROOT'} ne "") {
+       if (($ENV{'FAKEROOT'} ne "no") && ($ENV{'FAKEROOT'} ne "")) {
                $ldpreloadstring = $ENV{'FAKEROOT'};
        } else {
                if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" 
. $getuidlibrary; }
@@ -3244,7 +3244,7 @@ sub untar_package
 
        my $ldpreloadstring = "";
 
-       if ($ENV{'FAKEROOT'} ne "") {
+       if (($ENV{'FAKEROOT'} ne "no") && ($ENV{'FAKEROOT'} ne "")) {
                $ldpreloadstring = $ENV{'FAKEROOT'};
        } else {
                if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" 
. $getuidlibrary; }
diff --git a/main/sysui/desktop/debian/makefile.mk 
b/main/sysui/desktop/debian/makefile.mk
index 53ce001..de6d7d0 100644
--- a/main/sysui/desktop/debian/makefile.mk
+++ b/main/sysui/desktop/debian/makefile.mk
@@ -45,7 +45,7 @@ DEBFILES=$(foreach,i,{$(PRODUCTLIST)} 
$(PKGDIR)$/$i4.1-$(TARGET)-menus_$(PKGVERS
 
 .ENDIF
 
-.IF "$(FAKEROOT)"!=""
+.IF "$(FAKEROOT)"!="no"
 FAKEROOT2="$(FAKEROOT)"
 .ELSE
 FAKEROOT2="LD_PRELOAD=$(SOLARBINDIR)/getuid.so"