diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-09 20:16:32 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-09 20:28:46 +0100 |
| commit | c0ccf1914092931645d8f94f189b0328837b02f5 (patch) | |
| tree | 562a7e7a99e0f975f25263516efe4b93e78a0444 | |
| parent | 37f7a6b6c529140c827a875be7ad483a08e16631 (diff) | |
fdo#72451: installer: Make filelists work again.
regression from c2f5e09900561d417d53a74fd6bc189cb7d898e1
Change-Id: I840d066ec2fccb35fdbd96939c5593a71beb0abd
(cherry picked from commit 5015f04db460806a8247e97d9f1fe77f1501b255)
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index be1123d658cf..331095149265 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -874,7 +874,16 @@ sub get_Destination_Directory_For_Item_From_Directorylist # this is used f elsif ((!( $ispredefinedprogdir )) && (!( $ispredefinedconfigdir ))) { my $directorynameref = get_Directoryname_From_Directorygid($dirsarrayref, $searchdirgid, $onelanguage, $oneitemgid); - $destfilename = $$directorynameref . $installer::globals::separator . $oneitem->{'Name'}; + my $styles = ""; + if ($oneitem->{'Styles'}) { $styles = $oneitem->{'Styles'}; } + if ($styles =~ /\bFILELIST\b/) + { + $destfilename = $$directorynameref . $installer::globals::separator . $oneitemname; + } + else + { + $destfilename = $$directorynameref . $installer::globals::separator . $oneitem->{'Name'}; + } } else { |