diff options
| author | Andras Timar <atimar@suse.com> | 2012-09-22 17:28:09 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-09-23 22:07:46 +0200 |
| commit | 05dd0f135757b1e7393f31a4dc8f42e5943b91ee (patch) | |
| tree | e5c2926b798171effec42d8f3b6eaf9397efa3b4 /solenv/bin/modules | |
| parent | 0513e10635c85fc1aa214948de4992d4b76d555c (diff) | |
merge_mergemodules_into_msi_database: ditch unused function arguments
Change-Id: I33ea8817dcbd184cf824fc7252def5e3e9dfa3da
Diffstat (limited to 'solenv/bin/modules')
| -rw-r--r-- | solenv/bin/modules/installer.pm | 2 | ||||
| -rwxr-xr-x | solenv/bin/modules/installer/windows/mergemodule.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 287291afe26b..acec0b6e4856 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -1684,7 +1684,7 @@ sub run { installer::windows::msiglobal::write_summary_into_msi_database($msifilename, $onelanguage, $languagefile, $allvariableshashref); # if there are Merge Modules, they have to be integrated now - $filesinproductlanguageresolvedarrayref = installer::windows::mergemodule::merge_mergemodules_into_msi_database($mergemodulesarrayref, $filesinproductlanguageresolvedarrayref, $msifilename, $languagestringref, $onelanguage, $languagefile, $allvariableshashref, $includepatharrayref, $allupdatesequences, $allupdatelastsequences, $allupdatediskids); + $filesinproductlanguageresolvedarrayref = installer::windows::mergemodule::merge_mergemodules_into_msi_database($mergemodulesarrayref, $filesinproductlanguageresolvedarrayref, $msifilename, $languagestringref, $allvariableshashref, $includepatharrayref, $allupdatesequences, $allupdatelastsequences, $allupdatediskids); # copy msi database into installation directory diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm index bc12e1161bd0..f4e5951150cd 100755 --- a/solenv/bin/modules/installer/windows/mergemodule.pm +++ b/solenv/bin/modules/installer/windows/mergemodule.pm @@ -48,7 +48,7 @@ use installer::windows::language; sub merge_mergemodules_into_msi_database { - my ($mergemodules, $filesref, $msifilename, $languagestringref, $language, $languagefile, $allvariables, $includepatharrayref, $allupdatesequences, $allupdatelastsequences, $allupdatediskids) = @_; + my ($mergemodules, $filesref, $msifilename, $languagestringref, $allvariables, $includepatharrayref, $allupdatesequences, $allupdatelastsequences, $allupdatediskids) = @_; my $domerge = 0; if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) { $domerge = 1; } |