diff options
| author | Tim Retout <tim@retout.co.uk> | 2012-08-20 19:25:49 +0100 |
|---|---|---|
| committer | Tim Retout <tim@retout.co.uk> | 2012-08-21 22:23:39 +0100 |
| commit | e91df3e723b0bb9367cbdc7afffbec5ed923e959 (patch) | |
| tree | 22289ca113b84497fd562ef5bfc987879da87062 /solenv | |
| parent | installer: Remove code handling unused DELETE_ONLY and NOT_IN_SUITE flags. (diff) | |
| download | core-e91df3e723b0bb9367cbdc7afffbec5ed923e959.tar.gz core-e91df3e723b0bb9367cbdc7afffbec5ed923e959.zip | |
installer: Remove code handling unused ONLY_INSTALLED_PRODUCT flag.
Change-Id: I68e36229e79f4a97d0e0e490a211cbe607825f56
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/make_installer.pl | 5 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 35 |
2 files changed, 0 insertions, 40 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 7b524df01be5..7045b1dabfd3 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -402,11 +402,6 @@ if (! $installer::globals::tab) $filesinproductarrayref = installer::scriptitems::remove_tabonlyfiles_from_Installset($filesinproductarrayref); } -if (( $installer::globals::packageformat ne "installed" ) && ( $installer::globals::packageformat ne "archive" )) -{ - $filesinproductarrayref = installer::scriptitems::remove_installedproductonlyfiles_from_Installset($filesinproductarrayref); -} - installer::logger::print_message( "... analyzing scpactions ... \n" ); my $scpactionsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "ScpAction"); diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 6496efa8b2f3..9893beaf78de 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1720,41 +1720,6 @@ sub remove_tabonlyfiles_from_Installset return \@newitemsarray; } -############################################################################### -# Removing all files with flag ONLY_INSTALLED_PRODUCT from installation set. -# This function is not called for PKGFORMAT installed and archive. -############################################################################### - -sub remove_installedproductonlyfiles_from_Installset -{ - my ($itemsarrayref) = @_; - - my $infoline; - - my @newitemsarray = (); - - for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ ) - { - my $oneitem = ${$itemsarrayref}[$i]; - my $styles = ""; - if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; } - - if ( $styles =~ /\bONLY_INSTALLED_PRODUCT\b/ ) - { - $infoline = "Removing file $oneitem->{'gid'} from the installation set. This file is only required for PKGFORMAT archive or installed).\n"; - push( @installer::globals::globallogfileinfo, $infoline); - next; - } - - push(@newitemsarray, $oneitem); - } - - $infoline = "\n"; - push( @installer::globals::globallogfileinfo, $infoline); - - return \@newitemsarray; -} - ############################################################################ # Some files cotain a $ in their name. epm conflicts with such files. # Solution: Renaming this files, converting "$" to "$$" |