diff options
Diffstat (limited to 'solenv/bin/modules/installer/epmfile.pm')
| -rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index bc50aeb2fd30..36fd78d397d5 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -511,7 +511,6 @@ sub create_epm_header my $onereplaces = ${$allreplaces}[$i]; $onereplaces =~ s/\s*$//; installer::packagelist::resolve_packagevariables(\$onereplaces, $variableshashref, 1); - if ( $installer::globals::linuxlinkrpmprocess ) { $onereplaces = $onereplaces . "u"; } $line = "%replaces" . " " . $onereplaces . "\n"; push(@epmheader, $line); @@ -578,7 +577,6 @@ sub create_epm_header my $oneprovides = ${$allprovides}[$i]; $oneprovides =~ s/\s*$//; installer::packagelist::resolve_packagevariables(\$oneprovides, $variableshashref, 1); - if ( $installer::globals::linuxlinkrpmprocess ) { $oneprovides = $oneprovides . "u"; } $line = "%provides" . " " . $oneprovides . "\n"; push(@epmheader, $line); } @@ -588,8 +586,6 @@ sub create_epm_header { my $requiresstring = $onepackage->{$requires}; - if ( $installer::globals::add_required_package ) { $requiresstring = $requiresstring . "," . $installer::globals::add_required_package; } - # The requires string can contain the separator "," in the names (descriptions) of the packages # (that are required for Solaris depend files). Therefore "," inside such a description has to # masked with a backslash. @@ -613,28 +609,6 @@ sub create_epm_header push(@epmheader, $line); } } - else - { - if ( $installer::globals::add_required_package ) - { - my $requiresstring = $installer::globals::add_required_package; - - my $replacementstring = "COMMAREPLACEMENT"; - $requiresstring = installer::converter::replace_masked_separator($requiresstring, ",", "$replacementstring"); - my $allrequires = installer::converter::convert_stringlist_into_array(\$requiresstring, ","); - installer::converter::resolve_masked_separator($allrequires, ",", $replacementstring); - - for ( my $i = 0; $i <= $#{$allrequires}; $i++ ) - { - my $onerequires = ${$allrequires}[$i]; - $onerequires =~ s/\s*$//; - installer::packagelist::resolve_packagevariables(\$onerequires, $variableshashref, 0); - - $line = "%requires" . " " . $onerequires . "\n"; - push(@epmheader, $line); - } - } - } return \@epmheader; } |