diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-08 12:14:35 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:03 +0200 |
| commit | fd05a8fec2b7430b392a2647beb13f777cc0f22a (patch) | |
| tree | 44ca34e788f136f9a1f35efb765c547bebebb4cd | |
| parent | 9433b9074ce4336f029de464e077caf0d7e9794b (diff) | |
installer: adapt to find README and LICENSE in file lists
Change-Id: I9c949e61afd1afe9853b9afcd050803df3388e2f
| -rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index c1dd768b797e..503bd4c1543f 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -378,7 +378,8 @@ sub create_epm_header { my $onefile = ${$filesinproduct}[$i]; my $filename = $onefile->{'Name'}; - if ( $filename eq $possiblereadmefilename ) + # in the SDK it's in subdirectory sdk/share/readme + if ( $filename =~ /$possiblereadmefilename$/ ) { $foundreadmefile = 1; $line = "%readme" . " " . $onefile->{'sourcepath'} . "\n"; @@ -447,9 +448,10 @@ sub create_epm_header } else { - for my $onefile (@{$filesinproduct}) - { - if ($licensefilename eq $onefile->{'Name'}) + for my $onefile (@{$filesinproduct}) + { + # in the SDK it's in subdirectory sdk/share/readme so try to match that + if ($onefile->{'Name'} =~ /$licensefilename$/) { push @epmheader, "%license" . " " . $onefile->{'sourcepath'} . "\n"; $foundlicensefile = 1; |