setup_native/scripts/admin.pl | 5 +++-- solenv/bin/modules/installer/parameter.pm | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-)
New commits: commit 2126303ec6acc70f18289dcfddeaaea6b08b7915 Author: Jan Holesovsky <ke...@suse.cz> Date: Wed Jul 10 07:52:44 2013 +0200 Use mkdtemp() so that 2 builds can package at the same time. Change-Id: I86d01c3ec1267495bd664108fdcf2e5533d97430 diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl index 6fa2388..b7f4ce6 100644 --- a/setup_native/scripts/admin.pl +++ b/setup_native/scripts/admin.pl @@ -18,6 +18,7 @@ use Cwd; use File::Copy; +use File::Temp qw/ :mktemp /; ################################################################################# # Global settings @@ -29,7 +30,7 @@ BEGIN $targetdir = ""; $databasepath = ""; $starttime = ""; - $globaltempdirname = "ooopackaging"; + $globaltempdirname = "ooopackagingXXXXXX"; $savetemppath = ""; $msiinfo_available = 0; $path_displayed = 0; @@ -961,7 +962,7 @@ sub get_temppath $temppath =~ s/\Q$separator\E\s*$//; # removing ending slashes and backslashes $temppath = $temppath . $separator . $globaltempdirname; - create_directory_with_privileges($temppath, "777"); + $temppath = mkdtemp($temppath); my $dirsave = $temppath; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index 9c18ca3..4475ec4 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -25,6 +25,7 @@ use installer::globals; use installer::logger; use installer::remover; use installer::systemactions; +use File::Temp qw/ :mktemp /; ############################################ # Parameter Operations @@ -368,8 +369,9 @@ sub setglobalvariables { $installer::globals::temppath = $ENV{'TMPDIR'}; $installer::globals::temppath =~ s/\Q$installer::globals::separator\E\s*$//; # removing ending slashes and backslashes - $installer::globals::temppath .= $installer::globals::separator . 'ooopackaging'; - installer::systemactions::create_directory_with_privileges($installer::globals::temppath, "777"); + $installer::globals::temppath .= $installer::globals::separator . 'ooopackagingXXXXXX'; + $installer::globals::temppath = mkdtemp($installer::globals::temppath); + my $dirsave = $installer::globals::temppath; if ( $installer::globals::compiler =~ /^unxmac/ ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits