diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-11-20 14:54:38 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-20 09:44:18 -0600 |
| commit | b533869803537ca8f95fb3d7543ccaf067fdbbe0 (patch) | |
| tree | aaa3f4252df399c72402286315ee123ded5ebdc2 | |
| parent | a4d67ba5dc65e0eaa3ffe7fcfcdb55f59413385d (diff) | |
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 <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index ec54049eb3b7..699e39970e39 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); |