INTEGRATION: CWS nativesmoker (1.4.18); FILE MERGED

2004/07/01 11:06:38 is 1.4.18.1: #i30826# stop to pack if files are missing
Issue number:
Submitted by:
Reviewed by:
This commit is contained in:
Rüdiger Timm 2004-07-06 13:59:13 +00:00
parent 2a6706a4b0
commit dcfbe797ac

View file

@ -2,9 +2,9 @@
# #
# $RCSfile: scriptitems.pm,v $ # $RCSfile: scriptitems.pm,v $
# #
# $Revision: 1.5 $ # $Revision: 1.6 $
# #
# last change: $Author: hjs $ $Date: 2004-06-29 08:50:55 $ # last change: $Author: rt $ $Date: 2004-07-06 14:59:13 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
@ -692,6 +692,10 @@ sub remove_Files_Without_Sourcedirectory
my $infoline; my $infoline;
my $error_occured = 0;
my @missingfiles = ();
push(@missingfiles, "ERROR: The following files could not be found: \n");
my @newfilesarray = (); my @newfilesarray = ();
for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ ) for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
@ -705,6 +709,9 @@ sub remove_Files_Without_Sourcedirectory
$infoline = "ERROR: Removing file $filename from file list.\n"; $infoline = "ERROR: Removing file $filename from file list.\n";
push( @installer::globals::logfileinfo, $infoline); push( @installer::globals::logfileinfo, $infoline);
push(@missingfiles, "ERROR: File not found: $filename\n");
$error_occured = 1;
next; # removing this file from list, if sourcepath is empty next; # removing this file from list, if sourcepath is empty
} }
@ -714,6 +721,12 @@ sub remove_Files_Without_Sourcedirectory
$infoline = "\n"; $infoline = "\n";
push( @installer::globals::logfileinfo, $infoline); push( @installer::globals::logfileinfo, $infoline);
if ( $error_occured )
{
for ( my $i = 0; $i <= $#missingfiles; $i++ ) { print "$missingfiles[$i]"; }
installer::exiter::exit_program("ERROR: Missing files", "remove_Files_Without_Sourcedirectory");
}
return \@newfilesarray; return \@newfilesarray;
} }