summaryrefslogtreecommitdiff
path: root/solenv/bin/packimages.pl
diff options
context:
space:
mode:
authorDouglas Mencken <dougmencken@gmail.com>2016-10-15 12:04:41 -0400
committerjan iversen <jani@documentfoundation.org>2016-10-16 12:40:05 +0000
commit1d52483d990f7723fe709dd0348bb9b9d0e991f2 (patch)
tree2f5af96b76fbf4770858b1aba4138050a7440fac /solenv/bin/packimages.pl
parent5239cefff56875c7bb45c046977f1724aace0cfb (diff)
help packimages.pl be compatible with Perl versions before 5.12
configure.ac doesn’t check for the version of Perl at all so you can’t suppose that it is guaranteed to be 5.12 or beyond before this patch in the case you use perl < 5.12 at build time you would get Can't locate object method "newdir" via package "File::Temp" at solenv/bin/packimages.pl the commit 4e3dc8c141c2efd037c1f214b5edff071812b6a8 introduced such incompatibility Change-Id: Icd9281e0065ed67d69d07ac921b054deed052764 Reviewed-on: https://gerrit.libreoffice.org/29907 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'solenv/bin/packimages.pl')
-rw-r--r--solenv/bin/packimages.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index e9875b5bdc54..a768ebb508e4 100644
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -30,7 +30,7 @@ use File::Basename;
use File::Copy qw(copy);
use File::Path qw(make_path);
require File::Temp;
-use File::Temp ();
+use File::Temp qw(tempdir);
#### globals ####
@@ -355,7 +355,7 @@ sub optimize_zip_layout($)
sub copy_images($)
{
my ($zip_hash_ref) = @_;
- my $dir = File::Temp->newdir();
+ my $dir = tempdir();
foreach (keys %$zip_hash_ref) {
my $path = $zip_hash_ref->{$_} . "/$_";
my $outpath = $dir . "/$_";