diff options
| author | Ingo Schmidt <is@openoffice.org> | 2010-07-13 18:57:19 +0200 |
|---|---|---|
| committer | Ingo Schmidt <is@openoffice.org> | 2010-07-13 18:57:19 +0200 |
| commit | bde51d314523b7b9f4934c21a9d4f4612a57b36e (patch) | |
| tree | 18c4b5c25565905067272e5377f814e02cbde4e5 /solenv/bin/modules/installer/simplepackage.pm | |
| parent | 3ae43d50ee799f77f992ae14394e45c95de042aa (diff) | |
jl154 #162868# unopkg is back in packaging and installation
Diffstat (limited to 'solenv/bin/modules/installer/simplepackage.pm')
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 423d0b74eb4c..3ad13edd61ff 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -84,6 +84,15 @@ sub register_extensions { my ($officedir, $languagestringref, $bundleddir) = @_; + my $infoline = ""; + + if ( $bundleddir eq "" ) + { + $infoline = "ERROR: Failed to determine directory \"bundled\" in \"presets\" folder for extension registration! Please check your installation set.\n"; + push( @installer::globals::logfileinfo, $infoline); + installer::exiter::exit_program($infoline, "register_extensions"); + } + my $programdir = $officedir . $installer::globals::separator; if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; } $programdir = $programdir . "program"; @@ -91,8 +100,6 @@ sub register_extensions my $from = cwd(); chdir($programdir); - my $infoline = ""; - my $unopkgfile = $installer::globals::unopkgfile; my $unopkgexists = 1; |