diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-23 15:51:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-23 15:51:34 +0200 |
| commit | 7b4394f35b3557ffe61c8e9b0f0b630b31ca0977 (patch) | |
| tree | 918cf6afec3d26c148519102adac19b9b9755be1 /solenv | |
| parent | 51b0ada7403b7959cd0753218bff34b7cd4a7a24 (diff) | |
...but remove obsolete prereg-specific code again
Change-Id: I98b20e2ef7f0ec8f609464980398ca09847b40e9
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/modules/installer/simplepackage.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 4111378e704a..5bc319d4222b 100755 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -71,9 +71,8 @@ sub get_extensions_dir my $extensiondir = $subfolderdir . $installer::globals::separator; if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; } my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions"; - my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg" . $installer::globals::separator . "bundled"; - return ( $extensionsdir, $preregdir ); + return $extensionsdir; } ################################################################## @@ -671,7 +670,7 @@ sub create_simple_package installer::logger::print_message( "... removing superfluous directories ...\n" ); installer::logger::include_header_into_logfile("Removing superfluous directories:"); - my ( $extensionfolder, $preregdir ) = get_extensions_dir($subfolderdir); + my $extensionfolder = get_extensions_dir($subfolderdir); installer::systemactions::remove_empty_dirs_in_folder($extensionfolder); if ( $installer::globals::compiler =~ /^unxmacx/ ) |