From 78d03c63890700be56144cfbafda42749cfd58d2 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 2 Jun 2017 15:49:38 +0200
Subject: 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
---
 solenv/bin/modules/installer/globals.pm           | 1 -
 solenv/bin/modules/installer/windows/component.pm | 3 ---
 solenv/bin/modules/installer/windows/registry.pm  | 3 ---
 3 files changed, 7 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index c09b696c766c..2cd0cc21062c 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -256,7 +256,6 @@ BEGIN
     %allcabinetassigns = ();
     %cabfilecounter = ();
     %lastsequence = ();
-    %dontdeletecomponents = ();
     %allcalculated_guids = ();
     %calculated_component_guids = ();
     %all_english_languagestrings = ();
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index 65d79b84b816..9751caabd4ce 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -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;
 }
 
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 81c4f9a3b268..f7136b887023 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -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/ ))
             {
-- 
cgit