summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2010-09-24 15:22:59 +0200
committerPetr Mladek <pmladek@suse.cz>2010-09-24 15:22:59 +0200
commit565fa7f8e6b48d2e9737b1138405f4221ed08b58 (patch)
treeb66e66b201fd34d84a546e7e0ea11e9919033def
parent8e3fbafe46dbde4ad0c90f0909b37a2c12a27d5e (diff)
installer-get-path-correctly.diff: allow to get path also from ./fileOOO_BUILD_3_2_99_0_PRE
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
-rw-r--r--solenv/bin/modules/installer/pathanalyzer.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/pathanalyzer.pm b/solenv/bin/modules/installer/pathanalyzer.pm
index 95fcb8cd0..aab3e8654 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;
}