diff options
| author | Andras Timar <atimar@suse.com> | 2012-06-05 12:35:41 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-06-05 13:42:12 +0200 |
| commit | 22a29c2060355626ff0cba6c6d0ae70b8e2bbad3 (patch) | |
| tree | 3af78769dd9640648ed544f4dc51ca6761d78a24 /solenv | |
| parent | e74c007e25d05e49d94a94d9b024076faa02c8d0 (diff) | |
silence warnings
Change-Id: Ibc6addfe5eacf4a9e23f6f26830f5a1f9bf77594
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/modules/installer/windows/mergemodule.pm | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |