diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-12-17 20:38:17 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-12-17 20:39:05 +0100 |
| commit | b29399d6db60e7f7baee617267961fe7143ba9ec (patch) | |
| tree | d68bf1901592998791d83002ca88ea7fa0e4e566 /solenv | |
| parent | a528189281771522b0dbebe19c6a499a66026fa7 (diff) | |
find README/LICECENSE file for epm and help packs
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 5ae78343320c..c80a032a1e1c 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -460,6 +460,23 @@ sub create_epm_header } } + # the readme file need not be packaged more times in the help content + # it needs to be installed in parallel with the main package anyway + # try to find the README file between all available files (not only between the packaged) + if (!($foundreadmefile) && $installer::globals::helppack) + { + my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$readmefilenameen, "" , 0); + if($$fileref ne "" ) + { + $infoline = "Fallback to readme file: \"$$fileref\"!\n"; + push(@installer::globals::logfileinfo, $infoline); + + $foundreadmefile = 1; + $line = "%readme" . " " . $$fileref . "\n"; + push(@epmheader, $line); + } + } + # searching for and license file if ( $license_in_package_defined ) @@ -515,11 +532,12 @@ sub create_epm_header last; } } - if (!($foundlicensefile) && $installer::globals::languagepack) + + # the license file need not be packaged more times in the langpacks + # they need to be installed in parallel with the main package anyway + # try to find the LICENSE file between all available files (not only between the packaged) + if (!($foundlicensefile) && ($installer::globals::languagepack || $installer::globals::helppack)) { - # the license file need not be packaged more times in the langpacks - # they need to be installed in parallel with the main package anyway - # try to find the LICENSE file between all available files (not only between the packaged) my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, "" , 0); if($$fileref ne "" ) { |