diff options
| author | Tim Retout <tim@retout.co.uk> | 2012-02-22 22:41:03 +0000 |
|---|---|---|
| committer | Tim Retout <tim@retout.co.uk> | 2012-02-22 22:54:16 +0000 |
| commit | 617c91401651d96f4ad48b529efd8d2390ae7a4b (patch) | |
| tree | 1f19c3d956878e971bec7472194de7795be005dd | |
| parent | 23dace36e79aba275592d611298abe524d4adbbf (diff) | |
Remove unnecessary $run variable from installer.
| -rw-r--r-- | solenv/bin/make_installer.pl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 685881a74ec3..e2a94d44f916 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -1269,18 +1269,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if ( $installer::globals::linuxlinkrpms =~ /\b$onepackagename\b/ ) { - my $run = 0; - - if (( $installer::globals::makelinuxlinkrpm ) && ( ! $run )) + if ( $installer::globals::makelinuxlinkrpm ) { $filesinpackage = \@installer::globals::linuxpatchfiles; $linksinpackage = \@installer::globals::linuxlinks; $installer::globals::makelinuxlinkrpm = 0; if ( $installer::globals::patch ) { $installer::globals::call_epm = 1; } # enabling packing again - $run = 1; } - - if (( ! $installer::globals::makelinuxlinkrpm ) && ( ! $run )) + else { $filesinpackage = installer::worker::prepare_linuxlinkfiles($filesinpackage); $linksinpackage = installer::worker::prepare_forced_linuxlinkfiles($linksinpackage); @@ -1288,7 +1284,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) $installer::globals::add_required_package = $packagename . "u"; if ( $installer::globals::patch ) { $installer::globals::call_epm = 0; } # no packing of core module in patch $shellscriptsfilename = ""; # shell scripts only need to be included into the link rpm - $run = 1; } } } |