INTEGRATION: CWS native122 (1.16.34); FILE MERGED

2007/12/11 11:14:56 is 1.16.34.1: #i84448# Windows patch fix
This commit is contained in:
Kurt Zenker 2007-12-12 13:54:52 +00:00
parent 0829b88249
commit 88566ec00e

View file

@ -4,9 +4,9 @@
#
# $RCSfile: file.pm,v $
#
# $Revision: 1.16 $
# $Revision: 1.17 $
#
# last change: $Author: ihi $ $Date: 2007-11-26 16:19:13 $
# last change: $Author: kz $ $Date: 2007-12-12 14:54:52 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -383,7 +383,14 @@ sub generate_filename_for_filetable
if (( $installer::globals::prepare_winpatch ) && ( exists($installer::globals::savedmapping{"$fileref->{'componentname'}/$filename"}) ))
{
$installer::globals::savedmapping{"$fileref->{'componentname'}/$filename"} =~ m/.*;(.*)/;
$shortstring = $1 || $filename;
if ($1 ne '')
{
$shortstring = $1;
}
else
{
$shortstring = installer::windows::idtglobal::make_eight_three_conform_with_hash($filename, "file", $shortnamesref);
}
}
else
{