diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-09-11 22:28:02 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-09-12 00:20:39 +0200 |
commit | 80a672ecf3e537f1b29a1ae216510837846ceebf (patch) | |
tree | 34801706220086df493b4f02526419ea80312b4a | |
parent | 35698e8f703db5770c164c41f9c3169c50cee0ea (diff) |
installer: remove support for FILE_CAN_MISS style
The idea appears fundamentally error prone, and is unused.
Change-Id: I65e1c5b80d7101b8ba37c213fcb787d31e3b9d1d
-rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 1 | ||||
-rw-r--r-- | solenv/bin/modules/installer/worker.pm | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 71f974ee1bf5..bc1ac37af167 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1062,7 +1062,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist my $styles = ""; my $file_can_miss = 0; if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; } - if ( $styles =~ /\bFILE_CAN_MISS\b/ ) { $file_can_miss = 1; } if (( $installer::globals::languagepack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))) { $file_can_miss = 1; } if (( $installer::globals::helppack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCEHELPPACK\b/ ))) { $file_can_miss = 1; } diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index f511b54b2f3a..b97dae2f62c4 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -513,10 +513,6 @@ sub put_scpactions_into_installset my $sourcefile = $onescpaction->{'sourcepath'}; my $destfile = $destdir . $installer::globals::separator . $onescpaction->{'DestinationName'}; - my $styles = ""; - if ( $onescpaction->{'Styles'} ) { $styles = $onescpaction->{'Styles'}; } - if (( $styles =~ /\bFILE_CAN_MISS\b/ ) && ( $sourcefile eq "" )) { next; } - if (( $subdir =~ /\// ) || ( $subdir =~ /\\/ )) { installer::systemactions::create_directory_structure($destdir); |