You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2020/10/21 11:07:22 UTC
[openoffice] branch AOO42X updated: FAKEROOT is "" in the env
This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 1c537ab FAKEROOT is "" in the env
1c537ab is described below
commit 1c537ab234f20b6aedb252314bb2d44c452756f2
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Wed Oct 21 07:05:04 2020 -0400
FAKEROOT is "" in the env
---
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 4647545..c0942fb 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 "no") {
+ if ($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 "no") {
+ if ($ENV{'FAKEROOT'} ne "") {
$ldpreloadstring = $ENV{'FAKEROOT'};
} else {
if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
@@ -800,7 +800,7 @@ sub create_tar_gz_file_from_directory
my $ldpreloadstring = "";
- if ($ENV{'FAKEROOT'} ne "no") {
+ if ($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 99ae1c2..09c8d82 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 "no") {
+ if ($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 a73ca8a..651f87c 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 "no") {
+ if ($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 "no") {
+ if ($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 a60050b..2cf5fa5 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.2-$(TARGET)-menus_$(PKGVERS
.ENDIF
-.IF "$(FAKEROOT)"!="no"
+.IF "$(FAKEROOT)"!=""
FAKEROOT2="$(FAKEROOT)"
.ELSE
FAKEROOT2="LD_PRELOAD=$(SOLARBINDIR)/getuid.so"