INTEGRATION: CWS ab40_SRC680 (1.51.24); FILE MERGED
2007/08/16 10:38:12 is 1.51.24.1: #i80650# shortcuts into update rpm
This commit is contained in:
parent
620481141e
commit
1044e718fe
1 changed files with 62 additions and 23 deletions
|
@ -4,9 +4,9 @@
|
||||||
#
|
#
|
||||||
# $RCSfile: worker.pm,v $
|
# $RCSfile: worker.pm,v $
|
||||||
#
|
#
|
||||||
# $Revision: 1.51 $
|
# $Revision: 1.52 $
|
||||||
#
|
#
|
||||||
# last change: $Author: hr $ $Date: 2007-07-31 13:59:14 $
|
# last change: $Author: ihi $ $Date: 2007-08-20 13:22:56 $
|
||||||
#
|
#
|
||||||
# The Contents of this file are made available subject to
|
# The Contents of this file are made available subject to
|
||||||
# the terms of GNU Lesser General Public License Version 2.1.
|
# the terms of GNU Lesser General Public License Version 2.1.
|
||||||
|
@ -1373,33 +1373,72 @@ sub prepare_forced_linuxlinkfiles
|
||||||
|
|
||||||
if ( $isforcedlink )
|
if ( $isforcedlink )
|
||||||
{
|
{
|
||||||
my $fileid = $onelink->{'FileID'};
|
my $fileid = "";
|
||||||
my $searchedlinkfile = find_file_by_id(\@installer::globals::allfilessav, $fileid);
|
|
||||||
|
|
||||||
# making a copy!
|
if ( $onelink->{'ShortcutID'} )
|
||||||
|
{
|
||||||
|
$fileid = $onelink->{'ShortcutID'};
|
||||||
|
|
||||||
my %linkfilehash = ();
|
my $searchedlinkfile = find_file_by_id($linksref, $fileid);
|
||||||
my $linkfile = \%linkfilehash;
|
|
||||||
installer::converter::copy_item_object($searchedlinkfile, $linkfile);
|
|
||||||
|
|
||||||
$linkfile->{'Name'} = $onelink->{'Name'};
|
# making a copy!
|
||||||
$linkfile->{'destinationfile'} = $linkfile->{'destination'};
|
my %linkfilehash = ();
|
||||||
my $linkdestination = $linkfile->{'destinationfile'};
|
my $linkfile = \%linkfilehash;
|
||||||
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$linkdestination);
|
installer::converter::copy_item_object($searchedlinkfile, $linkfile);
|
||||||
$linkfile->{'destinationfile'} = $linkdestination;
|
|
||||||
|
|
||||||
my $localdestination = $linkfile->{'destination'};
|
$linkfile->{'Name'} = $onelink->{'Name'};
|
||||||
# Getting the path
|
$linkfile->{'destinationfile'} = $linkfile->{'destination'};
|
||||||
installer::pathanalyzer::get_path_from_fullqualifiedname(\$localdestination);
|
my $linkdestination = $linkfile->{'destinationfile'};
|
||||||
$localdestination =~ s/\Q$installer::globals::separator\E\s*$//;
|
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$linkdestination);
|
||||||
$linkfile->{'destination'} = $localdestination . $installer::globals::separator . $onelink->{'Name'};
|
$linkfile->{'destinationfile'} = $linkdestination;
|
||||||
|
|
||||||
$infoline = "Forced link into update file: $linkfile->{'destination'} pointing to $linkfile->{'destinationfile'} !\n";
|
my $localdestination = $linkfile->{'destination'};
|
||||||
push( @installer::globals::logfileinfo, $infoline);
|
# Getting the path
|
||||||
|
installer::pathanalyzer::get_path_from_fullqualifiedname(\$localdestination);
|
||||||
|
$localdestination =~ s/\Q$installer::globals::separator\E\s*$//;
|
||||||
|
$linkfile->{'destination'} = $localdestination . $installer::globals::separator . $onelink->{'Name'};
|
||||||
|
|
||||||
|
$infoline = "Forced link into update file: $linkfile->{'destination'} pointing to $linkfile->{'destinationfile'} !\n";
|
||||||
|
push( @installer::globals::logfileinfo, $infoline);
|
||||||
|
|
||||||
|
# The file, defined by the link, has to be included into the
|
||||||
|
# link array @installer::globals::linuxlinks
|
||||||
|
push( @installer::globals::linuxlinks, $linkfile );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $onelink->{'FileID'} )
|
||||||
|
{
|
||||||
|
$fileid = $onelink->{'FileID'};
|
||||||
|
|
||||||
|
my $searchedlinkfile = find_file_by_id(\@installer::globals::allfilessav, $fileid);
|
||||||
|
|
||||||
|
# making a copy!
|
||||||
|
my %linkfilehash = ();
|
||||||
|
my $linkfile = \%linkfilehash;
|
||||||
|
installer::converter::copy_item_object($searchedlinkfile, $linkfile);
|
||||||
|
|
||||||
|
$linkfile->{'Name'} = $onelink->{'Name'};
|
||||||
|
$linkfile->{'destinationfile'} = $linkfile->{'destination'};
|
||||||
|
my $linkdestination = $linkfile->{'destinationfile'};
|
||||||
|
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$linkdestination);
|
||||||
|
$linkfile->{'destinationfile'} = $linkdestination;
|
||||||
|
|
||||||
|
my $localdestination = $linkfile->{'destination'};
|
||||||
|
# Getting the path
|
||||||
|
installer::pathanalyzer::get_path_from_fullqualifiedname(\$localdestination);
|
||||||
|
$localdestination =~ s/\Q$installer::globals::separator\E\s*$//;
|
||||||
|
$linkfile->{'destination'} = $localdestination . $installer::globals::separator . $onelink->{'Name'};
|
||||||
|
|
||||||
|
$infoline = "Forced link into update file: $linkfile->{'destination'} pointing to $linkfile->{'destinationfile'} !\n";
|
||||||
|
push( @installer::globals::logfileinfo, $infoline);
|
||||||
|
|
||||||
|
# The file, defined by the link, has to be included into the
|
||||||
|
# link array @installer::globals::linuxlinks
|
||||||
|
push( @installer::globals::linuxlinks, $linkfile );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $fileid eq "" ) { installer::exiter::exit_program("ERROR: No FileID assigned to forced link $onelink->{'gid'} !", "prepare_forced_linuxlinkfiles"); }
|
||||||
|
|
||||||
# The file, defined by the link, has to be included into the
|
|
||||||
# link array @installer::globals::linuxlinks
|
|
||||||
push( @installer::globals::linuxlinks, $linkfile );
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue