[Libreoffice-commits] core.git: solenv/bin

[Douglas Mencken]

 solenv/bin/packimages.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1d52483d990f7723fe709dd0348bb9b9d0e991f2
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Sat Oct 15 12:04:41 2016 -0400

    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 at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>

diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index e9875b5..a768ebb 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 . "/$_";