[Libreoffice-commits] .: Branch 'libreoffice-3-3' - solenv/bin

[Petr Mladek]

 solenv/bin/modules/installer/epmfile.pm |   26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 75f9558a0c00b1ecc5119e899314c26bf4f3e966
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Dec 17 20:38:17 2010 +0100

    find README/LICECENSE file for epm and help packs

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 1260b74..946d225 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 "" )
             {