summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-09-12 18:09:01 +0200
committerAndras Timar <atimar@suse.com>2012-09-12 18:09:51 +0200
commit11b85ee29966df2e4942e236a629205f4280930b (patch)
tree1ec7fdf0cddbe79996afc8b039c6b135c7ba0f1c
parent8c8492892b68a010e55d4d19a89425cf7d98814d (diff)
fdo#44565 do not delete empty Desktop folder on uninstall
Change-Id: I74f0f3a5bcfb381ea941a853c3d5e5e27f7f57e7
-rw-r--r--solenv/bin/modules/installer/windows/removefile.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/windows/removefile.pm b/solenv/bin/modules/installer/windows/removefile.pm
index 7b302ac1e0e9..2fed5296888f 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;