[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/windows/update.pm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4446880a1d004a2151a17e601915a4af927a52e9
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Aug 22 06:41:57 2014 -0700

    use MSM directly from MSVC dir
    
    Change-Id: I62ebf7f7bc10a81a3949b0aad6e6353619ef6b22
    (cherry picked from commit 4f4bd6c852e2daac9ee30957538cf796f9f8e989)
    Reviewed-on: https://gerrit.libreoffice.org/11092
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
index d49625a..0edaaf2 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;