strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use MSM directly from MSVC dir

Browse source 
Change-Id: I62ebf7f7bc10a81a3949b0aad6e6353619ef6b22
This commit is contained in:
Andras Timar 2014-08-22 06:41:57 -07:00
parent 29c4a88e01
commit 4f4bd6c852
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
solenv/bin/modules/installer/windows/update.pm
View file

@ -423,10 +423,10 @@ sub readmergedatabase
foreach my $mergemodule ( @{$mergemodules} )
{
my $filename = $mergemodule->{'Name'};
my $mergefile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
my $mergefile = $ENV{'MSM_PATH'} . $filename;
if ( $$mergefile eq "" ) { installer::exiter::exit_program("ERROR: msm file not found: $filename !", "readmergedatabase"); }
my $completesource = $$mergefile;
if ( ! -f $mergefile ) { installer::exiter::exit_program("ERROR: msm file not found: $filename !", "readmergedatabase"); }
my $completesource = $mergefile;
my $mergegid = $mergemodule->{'gid'};
my $workdir = $mergemoduledir . $installer::globals::separator . $mergegid;