diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 12:09:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 12:09:45 +0000 |
| commit | 0289bb4a63060e3e820906aa51f5daf97ddb627c (patch) | |
| tree | bb8511f6f1f3a4955aa12e9d901180c3463249ae /solenv | |
| parent | e2f70f685d0437d9004b8dc28e925da585e2992f (diff) | |
INTEGRATION: CWS native135 (1.8.60); FILE MERGED
2008/03/04 16:49:38 is 1.8.60.1: #i86686# Solaris language selection broken
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/xpdinstaller.pm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm index 9029c6718620..3897496fe931 100644 --- a/solenv/bin/modules/installer/xpdinstaller.pm +++ b/solenv/bin/modules/installer/xpdinstaller.pm @@ -4,9 +4,9 @@ # # $RCSfile: xpdinstaller.pm,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: rt $ $Date: 2008-03-20 10:54:29 $ +# last change: $Author: kz $ $Date: 2008-04-03 13:09:45 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -1215,14 +1215,13 @@ sub create_xpd_file my $modulegid = $onepackage->{'module'}; - my $onelanguage = ""; my $solslanguage = ""; - my $islanguagemodule = 0; - if ( $onepackage->{'islanguagemodule'} ) { $islanguagemodule = $onepackage->{'islanguagemodule'}; } - if ( $islanguagemodule ) + if ( $installer::globals::issolarispkgbuild ) { - $onelanguage = $onepackage->{'language'}; - if ( $installer::globals::issolarispkgbuild ) { $solslanguage = installer::epmfile::get_solaris_language_for_langpack($onelanguage); } + if ( $onepackage->{'specificlanguage'} ) + { + $solslanguage = installer::epmfile::get_solaris_language_for_langpack($onepackage->{'specificlanguage'}); + } } installer::logger::include_header_into_logfile("Creating xpd file ($modulegid):"); |