diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-08-22 06:41:57 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-08-23 17:40:45 +0200 |
| commit | 4f4bd6c852e2daac9ee30957538cf796f9f8e989 (patch) | |
| tree | 4b15a1297613515e2807c6bd2a5639e73bfd5357 /solenv | |
| parent | 29c4a88e01b6892f097c6c1e34649e7011b95fe9 (diff) | |
use MSM directly from MSVC dir
Change-Id: I62ebf7f7bc10a81a3949b0aad6e6353619ef6b22
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/update.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm index d49625a54479..0edaaf2d8d91 100644 --- a/solenv/bin/modules/installer/windows/update.pm +++ b/solenv/bin/modules/installer/windows/update.pm @@ -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; |