[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - solenv/bin

[Christian Lohmaier]

 solenv/bin/modules/par2script/work.pm |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 447fe6b3231bd636aba84d77b0061eb06ed3999b
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Jun 1 20:47:06 2018 +0200

    par2script: don't bother removing already removed parts of arguments
    
    the s/\@// conflicts with jenkins default directory naming for
    concurrent builds and is wrong at this place/in this form:
    0ce067c1fc334680a7d99e573ae8c2f3e623b645 already changed the format of
    the parameter from @listfile to @@listfile, so stripping a single @ at
    the front won't help at all.
    Furthermore the stripping already was added to the
    par2script/parameters.pm earlier, so the worker functions don't need to
    deal with transforming commandline arguments.
    
    Change-Id: Ic55b8cda3cd114dfc5cb7ded6d53174cd8283af9
    Reviewed-on: https://gerrit.libreoffice.org/55196
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    (cherry picked from commit 6fbcb4f1ad6bbcaac1fade0abf6bbe8215c1f4ab)
    Reviewed-on: https://gerrit.libreoffice.org/55632

diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm
index 80037850bcc4..cc1f1e4d5607 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -79,8 +79,6 @@ sub setparfiles
     my ($filename) = @_;
 
     # input is the name of the list file
-    $filename =~ s/\@//;    # removing the leading \@
-
     my $filecontent = par2script::files::read_file($filename);
 
     my @parfiles = ();