From 22a29c2060355626ff0cba6c6d0ae70b8e2bbad3 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 5 Jun 2012 12:35:41 +0200 Subject: silence warnings Change-Id: Ibc6addfe5eacf4a9e23f6f26830f5a1f9bf77594 --- solenv/bin/modules/installer/windows/mergemodule.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm index e60702b5164e..bc12e1161bd0 100755 --- a/solenv/bin/modules/installer/windows/mergemodule.pm +++ b/solenv/bin/modules/installer/windows/mergemodule.pm @@ -235,7 +235,7 @@ sub merge_mergemodules_into_msi_database # Determining name of cabinet file in installation set my $cabfilename = $mergemodule->{'Cabfilename'}; - installer::packagelist::resolve_packagevariables(\$cabfilename, $allvariables, 0); + if ( $cabfilename ) { installer::packagelist::resolve_packagevariables(\$cabfilename, $allvariables, 0); } # Analyzing styles # Flag REMOVE_FILE_TABLE is required for msvc9 Merge-Module, because otherwise msidb.exe @@ -317,7 +317,7 @@ sub merge_mergemodules_into_msi_database $installer::globals::mergemodules{$mergegid} = \%onemergemodulehash; # Collecting all cab files, to copy them into installation set - $installer::globals::copy_msm_files{$cabfilename} = $onemergemodulehash{'cabinetfile'}; + if ( $cabfilename ) { $installer::globals::copy_msm_files{$cabfilename} = $onemergemodulehash{'cabinetfile'}; } chdir($from); } -- cgit