solenv/bin/modules/installer/simplepackage.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit 7b4394f35b3557ffe61c8e9b0f0b630b31ca0977 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Aug 23 15:51:34 2012 +0200 ...but remove obsolete prereg-specific code again Change-Id: I98b20e2ef7f0ec8f609464980398ca09847b40e9 diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 4111378..5bc319d 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/ ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits