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

Stephan Bergmann sbergman at redhat.com
Tue Mar 20 08:57:16 UTC 2018


 solenv/bin/modules/installer/simplepackage.pm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 049d94a5fcfa55039a166164648ecdb28fe7291f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 16 14:49:13 2018 +0100

    Make failure to create symlink a fatal error
    
    ...see commit message of f07e2496963baf8f7c0fecc79e7a420544075d98 "sdk/lib dir
    missing from Linux installation sets"
    
    Change-Id: Idb0f3437c27c867bc628fd3084f2a54c47beef17
    Reviewed-on: https://gerrit.libreoffice.org/51428
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 23b9983a6eb5..30f41e43f6ff 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -652,10 +652,10 @@ sub create_simple_package
         my $target = $onelink->{'Target'};
         my $destination = $subfolderdir . $installer::globals::separator . $onelink->{'destination'};
 
-        my $localcall = "ln -sf \'$target\' \'$destination\' \>\/dev\/null 2\>\&1";
-        system($localcall);
+        my @localcall = ('ln', '-sf', $target, $destination);
+        system(@localcall) == 0 or die "system @localcall failed: $?";
 
-        $infoline = "Creating Unix link: \"ln -sf $target $destination\"\n";
+        $infoline = "Creating Unix link: \"@localcall\"\n";
         push(@installer::globals::logfileinfo, $infoline);
     }
 


More information about the Libreoffice-commits mailing list