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 2019/01/16 14:33:38 UTC
svn commit: r1851449 - in /openoffice/trunk/main:
solenv/bin/modules/installer/download.pm
solenv/bin/modules/installer/epmfile.pm
solenv/bin/modules/installer/worker.pm sysui/desktop/debian/makefile.mk
Author: jim
Date: Wed Jan 16 14:33:38 2019
New Revision: 1851449
URL: http://svn.apache.org/viewvc?rev=1851449&view=rev
Log:
As long as we have the full path, use it
Modified:
openoffice/trunk/main/solenv/bin/modules/installer/download.pm
openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm
openoffice/trunk/main/solenv/bin/modules/installer/worker.pm
openoffice/trunk/main/sysui/desktop/debian/makefile.mk
Modified: openoffice/trunk/main/solenv/bin/modules/installer/download.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/download.pm?rev=1851449&r1=1851448&r2=1851449&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/download.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/download.pm Wed Jan 16 14:33:38 2019
@@ -305,7 +305,7 @@ sub tar_package
my $ldpreloadstring = "";
if ($ENV{'FAKEROOT'} ne "no") {
- $ldpreloadstring = "fakeroot"
+ $ldpreloadstring = $ENV{'FAKEROOT'};
} else {
if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
}
@@ -376,7 +376,7 @@ sub create_tar_gz_file_from_package
my $ldpreloadstring = "";
if ($ENV{'FAKEROOT'} ne "no") {
- $ldpreloadstring = "fakeroot"
+ $ldpreloadstring = $ENV{'FAKEROOT'};
} else {
if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
}
@@ -801,7 +801,7 @@ sub create_tar_gz_file_from_directory
my $ldpreloadstring = "";
if ($ENV{'FAKEROOT'} ne "no") {
- $ldpreloadstring = "fakeroot"
+ $ldpreloadstring = $ENV{'FAKEROOT'};
} else {
if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm?rev=1851449&r1=1851448&r2=1851449&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm Wed Jan 16 14:33:38 2019
@@ -893,7 +893,7 @@ sub get_ld_preload_string
if ($ENV{'FAKEROOT'} ne "no") {
- $ldpreloadstring = "fakeroot"
+ $ldpreloadstring = $ENV{'FAKEROOT'};
} else {
Modified: openoffice/trunk/main/solenv/bin/modules/installer/worker.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/worker.pm?rev=1851449&r1=1851448&r2=1851449&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/worker.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/worker.pm Wed Jan 16 14:33:38 2019
@@ -3201,7 +3201,7 @@ sub tar_package
my $ldpreloadstring = "";
if ($ENV{'FAKEROOT'} ne "no") {
- $ldpreloadstring = "fakeroot"
+ $ldpreloadstring = $ENV{'FAKEROOT'};
} else {
if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
}
@@ -3245,7 +3245,7 @@ sub untar_package
my $ldpreloadstring = "";
if ($ENV{'FAKEROOT'} ne "no") {
- $ldpreloadstring = "fakeroot"
+ $ldpreloadstring = $ENV{'FAKEROOT'};
} else {
if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
}
Modified: openoffice/trunk/main/sysui/desktop/debian/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/debian/makefile.mk?rev=1851449&r1=1851448&r2=1851449&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/debian/makefile.mk (original)
+++ openoffice/trunk/main/sysui/desktop/debian/makefile.mk Wed Jan 16 14:33:38 2019
@@ -46,7 +46,7 @@ DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(
.ENDIF
.IF "$(FAKEROOT)"!="no"
-FAKEROOT2="fakeroot"
+FAKEROOT2="$(FAKEROOT)"
.ELSE
FAKEROOT2="LD_PRELOAD=$(SOLARBINDIR)/getuid.so"
.ENDIF