Kaydet (Commit) 78d03c63 authored tarafından Michael Stahl's avatar Michael Stahl

solenv: installer: remove DONT_DELETE style

This style was only handled in the installer code for registry items,
but in scp2 it was only set for files, so effectively it was unused.

Change-Id: I197eeded29648aee2489e302f7b5e48bf13a545c
üst f8de1df4
......@@ -256,7 +256,6 @@ BEGIN
%allcabinetassigns = ();
%cabfilecounter = ();
%lastsequence = ();
%dontdeletecomponents = ();
%allcalculated_guids = ();
%calculated_component_guids = ();
%all_english_languagestrings = ();
......
......@@ -249,9 +249,6 @@ sub get_registry_component_attributes
# Setting msidbComponentAttributes64bit for 64 bit shell extension in 32 bit installer, too
if ( $componentname =~ m/winexplorerext_x64/ ) { $attributes |= 256; }
# Setting msidbComponentAttributesPermanent
if ( exists($installer::globals::dontdeletecomponents{$componentname}) ) { $attributes |= 16; }
return $attributes;
}
......
......@@ -363,11 +363,8 @@ sub create_registry_table
push(@{$allregistrycomponentsref}, $registry{'Component_'});
}
# Collecting all components with DONT_DELETE style
my $style = "";
if ( $oneregistry->{'Styles'} ) { $style = $oneregistry->{'Styles'}; }
if ( $style =~ /\bDONT_DELETE\b/ ) { $installer::globals::dontdeletecomponents{$registry{'Component_'}} = 1; }
# Collecting all registry components with ALWAYS_REQUIRED style
if ( ! ( $style =~ /\bALWAYS_REQUIRED\b/ ))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment