summaryrefslogtreecommitdiff
path: root/solenv/bin/modules/installer/windows/createfolder.pm
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-11-22 16:54:03 +0100
committerDavid Tardon <dtardon@redhat.com>2013-11-22 16:57:25 +0100
commitedb0626a37f16b1bf705e8902f0c46ed46a6d0cd (patch)
tree19c83bd31086e2032e6913ee7a6b200cf92046c4 /solenv/bin/modules/installer/windows/createfolder.pm
parentfe09dbf8cafdf7741ff8086b3683476b58df186c (diff)
define module, not file
Change-Id: Ie828de19cc35228cd332ecbb5e11f2edb281bad8
Diffstat (limited to 'solenv/bin/modules/installer/windows/createfolder.pm')
-rw-r--r--solenv/bin/modules/installer/windows/createfolder.pm16
1 files changed, 12 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
index 232415d3e7ca..02b29cd393bd 100644
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ b/solenv/bin/modules/installer/windows/createfolder.pm
@@ -76,16 +76,24 @@ sub get_createfolder_component
# Therefore they can only belong to the root module and
# will be added to a component at the root module.
# All directories will be added to the component
- # containing the file $allvariableshashref->{'GLOBALFILEGID'}
+ # $allvariableshashref->{'ROOTMODULEGID'}
- if ( ! $allvariableshashref->{'GLOBALFILEGID'} ) { installer::exiter::exit_program("ERROR: GLOBALFILEGID must be defined in list file!", "get_createfolder_component"); }
+ if ( ! $allvariableshashref->{'ROOTMODULEGID'} ) { installer::exiter::exit_program("ERROR: ROOTMODULEGID must be defined in list file!", "get_createfolder_component"); }
- my $globalfilegid = $allvariableshashref->{'GLOBALFILEGID'};
+ my $rootmodulegid = $allvariableshashref->{'ROOTMODULEGID'};
my $onefile;
if ( $installer::globals::languagepack ) { $onefile = get_languagepack_file($filesref, $onedir); }
elsif ( $installer::globals::helppack ) { ($onefile) = grep {$_->{gid} eq 'gid_File_Help_Common_Zip'} @{$filesref} }
- else { ($onefile) = grep {$_->{gid} eq $globalfilegid} @{$filesref} }
+ else {
+ foreach my $file (@{$filesref}) {
+ if ($file->{'modules'} eq $rootmodulegid)
+ {
+ $onefile = $file;
+ break;
+ }
+ }
+ }
if (! defined $onefile) {
installer::exiter::exit_program("ERROR: Could not find file!", "get_createfolder_component");