diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-29 23:18:50 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-30 00:01:36 +0100 |
| commit | 8817dcb8f43051d352c0caed6eebf29c6b0192b8 (patch) | |
| tree | c2009cbcf22876d0f3136a563529ecca4ef2def0 /solenv/bin/modules | |
| parent | 5503a68395641d8ae927c635eec2960c617ddbc3 (diff) | |
l10ntools: remove Package_ulfconv
Change-Id: I7a8c3fdf34951e00fca8c0a2543f33817fa874fa
Diffstat (limited to 'solenv/bin/modules')
| -rw-r--r-- | solenv/bin/modules/installer/control.pm | 7 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 955158d06c49..6e81431a82fe 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -408,14 +408,13 @@ sub check_logfile sub read_lcidlist { my ($patharrayref) = @_; - my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::lcidlistname, $patharrayref , 0); - if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Did not find Windows LCID list $installer::globals::lcidlistname!", "read_lcidlist"); } + if ( ! -f $installer::globals::lcidlistname ) { installer::exiter::exit_program("ERROR: Did not find Windows LCID list $installer::globals::lcidlistname!", "read_lcidlist"); } - my $infoline = "Found LCID file: $$fileref\n"; + my $infoline = "Found LCID file: $installer::globals::lcidlistname\n"; push(@installer::globals::globallogfileinfo, $infoline); - my $lcidlist = installer::files::read_file($$fileref); + my $lcidlist = installer::files::read_file($installer::globals::lcidlistname); my %msilanguage = (); for ( my $i = 0; $i <= $#{$lcidlist}; $i++ ) diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 29ca75d63afd..23b76d06afca 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -81,7 +81,7 @@ BEGIN $templatefoldername = "Templates"; $programmenufolder = "ProgramMenuFolder"; $systemfolder = "SystemFolder"; - $lcidlistname = "msi-encodinglist.txt"; + $lcidlistname = $ENV{'SRCDIR'} . "/l10ntools/source/ulfconv/msi-encodinglist.txt"; $msilanguage = ""; # hash reference for msi languages LCID $sofficeiconadded = 0; $temppath = ""; |