strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ab40_SRC680 (1.51.24); FILE MERGED

Browse source 
2007/08/16 10:38:12 is 1.51.24.1: #i80650# shortcuts into update rpm
This commit is contained in:
Ivo Hinkelmann 2007-08-20 12:22:56 +00:00
parent 620481141e
commit 1044e718fe
1 changed files with 62 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
solenv/bin/modules/installer/worker.pm
View file

@ -4,9 +4,9 @@
#
# $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 terms of GNU Lesser General Public License Version 2.1.
@ -1373,11 +1373,15 @@ sub prepare_forced_linuxlinkfiles
if ( $isforcedlink )
{
my $fileid = $onelink->{'FileID'};
my $searchedlinkfile = find_file_by_id(\@installer::globals::allfilessav, $fileid);
my $fileid = "";
if ( $onelink->{'ShortcutID'} )
{
$fileid = $onelink->{'ShortcutID'};
my $searchedlinkfile = find_file_by_id($linksref, $fileid);
# making a copy!
my %linkfilehash = ();
my $linkfile = \%linkfilehash;
installer::converter::copy_item_object($searchedlinkfile, $linkfile);
@ -1401,6 +1405,41 @@ sub prepare_forced_linuxlinkfiles
# 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"); }
}
else
{
# Links with flag FORCE_INTO_UPDATE_PACKAGE are forced into "u"-RPM. All other