[ooo-build-commit] .: solenv/bin

Petr Mladek pmladek at kemper.freedesktop.org
Fri Sep 24 06:25:58 PDT 2010


 solenv/bin/modules/installer/pathanalyzer.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 565fa7f8e6b48d2e9737b1138405f4221ed08b58
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Sep 24 15:22:59 2010 +0200

    installer-get-path-correctly.diff: allow to get path also from ./file
    
    Otherwise, it installed the license files into ugly subdirectories
    for example into <ooo-home>/LICENSE.html/LICENSE.html
    even worse, the direcotry had the rights 444

diff --git a/solenv/bin/modules/installer/pathanalyzer.pm b/solenv/bin/modules/installer/pathanalyzer.pm
index 95fcb8c..aab3e86 100644
--- a/solenv/bin/modules/installer/pathanalyzer.pm
+++ b/solenv/bin/modules/installer/pathanalyzer.pm
@@ -39,7 +39,7 @@ sub get_path_from_fullqualifiedname
 
     if ( $$longfilenameref =~ /\Q$installer::globals::separator\E/ )	# Is there a separator in the path? Otherwise the path is empty.
     {	
-        if ( $$longfilenameref =~ /^\s*(\S.*\S\Q$installer::globals::separator\E)(\S.+\S?)/ )
+        if ( $$longfilenameref =~ /^\s*(.*\Q$installer::globals::separator\E)(.+)/ )
         {
             $$longfilenameref = $1;
         }


More information about the ooo-build-commit mailing list