solenv/bin/modules/installer/download.pm | 6 ++++++ 1 file changed, 6 insertions(+)
New commits: commit b533869803537ca8f95fb3d7543ccaf067fdbbe0 Author: Andras Timar <[email protected]> Date: Wed Nov 20 14:54:38 2013 +0100 fdo#67060 do not package RPM-only install script to DEB packs Change-Id: I90c74f0d00804b80daeca2c69d1f12e094243a81 Reviewed-on: https://gerrit.libreoffice.org/6734 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index ec54049..699e399 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -535,6 +535,12 @@ sub create_tar_gz_file_from_directory $installer::globals::downloadfilename = $downloadfilename . $installer::globals::downloadfileextension; my $targzname = $downloaddir . $installer::globals::separator . $installer::globals::downloadfilename; + # fdo#67060 - install script is for RPM only + if ( -e "$installdir/install" && !$installer::globals::isrpmbuild ) + { + unlink("$installdir/install"); + } + my $systemcall = "cd $changedir; $ldpreloadstring tar -cf - $packdir | gzip > $targzname"; my $returnvalue = system($systemcall); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
