diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 10:46:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 10:46:26 +0000 |
| commit | b220b8542f52341b4500d11690b77cb624bfc056 (patch) | |
| tree | ecac8f0f85b66daec36b2717366073aacd13b944 | |
| parent | 1c4b838b9ba74fc658c575aed9e1d62d7ba058a3 (diff) | |
INTEGRATION: CWS native87 (1.46.58); FILE MERGED
2007/06/20 08:19:50 is 1.46.58.2: RESYNC: (1.46-1.49); FILE MERGED
2007/04/25 12:28:59 is 1.46.58.1: #i65425# preparing copy of jre
| -rw-r--r-- | solenv/bin/modules/installer/worker.pm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index 06a42d4a4722..adcef904b457 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -4,9 +4,9 @@ # # $RCSfile: worker.pm,v $ # -# $Revision: 1.49 $ +# $Revision: 1.50 $ # -# last change: $Author: kz $ $Date: 2007-05-21 10:41:04 $ +# last change: $Author: rt $ $Date: 2007-07-03 11:46:26 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -2121,6 +2121,14 @@ sub put_scpactions_into_installset my $destdir = $installdir; $destdir =~ s/\Q$installer::globals::separator\E\s*$//; if ( $subdir ) { $destdir = $destdir . $installer::globals::separator . $subdir; } + + my $sourcefile = $onescpaction->{'sourcepath'}; + my $destfile = $destdir . $installer::globals::separator . $onescpaction->{'DestinationName'}; + + my $styles = ""; + if ( $onescpaction->{'Styles'} ) { $styles = $onescpaction->{'Styles'}; } + if (( $styles =~ /\bFILE_CAN_MISS\b/ ) && ( $sourcefile eq "" )) { next; } + if (( $subdir =~ /\// ) || ( $subdir =~ /\\/ )) { installer::systemactions::create_directory_structure($destdir); @@ -2130,9 +2138,6 @@ sub put_scpactions_into_installset installer::systemactions::create_directory($destdir); } - my $sourcefile = $onescpaction->{'sourcepath'}; - my $destfile = $destdir . $installer::globals::separator . $onescpaction->{'DestinationName'}; - installer::systemactions::copy_one_file($sourcefile, $destfile); if ( $onescpaction->{'UnixRights'} ) |