solenv/bin/modules/installer/windows/removefile.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 11b85ee29966df2e4942e236a629205f4280930b Author: Andras Timar <[email protected]> Date: Wed Sep 12 18:09:01 2012 +0200 fdo#44565 do not delete empty Desktop folder on uninstall Change-Id: I74f0f3a5bcfb381ea941a853c3d5e5e27f7f57e7 diff --git a/solenv/bin/modules/installer/windows/removefile.pm b/solenv/bin/modules/installer/windows/removefile.pm index 7b302ac..2fed529 100644 --- a/solenv/bin/modules/installer/windows/removefile.pm +++ b/solenv/bin/modules/installer/windows/removefile.pm @@ -128,6 +128,8 @@ sub create_removefile_table $removefile{'Component_'} = get_removefile_component($onelink); $removefile{'FileName'} = get_removefile_filename($onelink); $removefile{'DirProperty'} = get_removefile_dirproperty($onelink); + # fdo#44565 do not remove empty Desktop folder + if ( $removefile{'DirProperty'} eq $installer::globals::desktopfolder ) { next; } $removefile{'InstallMode'} = get_removefile_installmode($onelink); my $oneline = $removefile{'FileKey'} . "\t" . $removefile{'Component_'} . "\t" . $removefile{'FileName'} . "\t" @@ -145,4 +147,4 @@ sub create_removefile_table } -1; \ No newline at end of file +1; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
