|
 |
f325b2 |
From eab93c587dd524241f63e885b0e4ac8700da5d16 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: David Tardon <dtardon@redhat.com>
|
|
|
f325b2 |
Date: Mon, 3 Feb 2014 20:31:04 +0100
|
|
|
f325b2 |
Subject: [PATCH] solenv: allow missing files
|
|
|
f325b2 |
|
|
|
f325b2 |
---
|
|
|
f325b2 |
solenv/bin/modules/installer/scriptitems.pm | 15 ++++++---------
|
|
|
f325b2 |
1 file changed, 6 insertions(+), 9 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
|
|
|
f325b2 |
index 4c384ce..963ca84 100644
|
|
|
f325b2 |
--- a/solenv/bin/modules/installer/scriptitems.pm
|
|
|
f325b2 |
+++ b/solenv/bin/modules/installer/scriptitems.pm
|
|
|
f325b2 |
@@ -1133,11 +1133,10 @@ sub remove_Files_Without_Sourcedirectory
|
|
|
f325b2 |
|
|
|
f325b2 |
if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- $infoline = "ERROR: Removing file $filename from file list.\n";
|
|
|
f325b2 |
+ $infoline = "WARNING: Removing file $filename from file list.\n";
|
|
|
f325b2 |
push( @installer::globals::logfileinfo, $infoline);
|
|
|
f325b2 |
|
|
|
f325b2 |
- push(@missingfiles, "ERROR: File not found: $filename\n");
|
|
|
f325b2 |
- $error_occurred = 1;
|
|
|
f325b2 |
+ push(@missingfiles, "WARNING: File not found: $filename\n");
|
|
|
f325b2 |
|
|
|
f325b2 |
next; # removing this file from list, if sourcepath is empty
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -1145,11 +1144,10 @@ sub remove_Files_Without_Sourcedirectory
|
|
|
f325b2 |
{
|
|
|
f325b2 |
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- $infoline = "ERROR: Removing file $filename from file list.\n";
|
|
|
f325b2 |
+ $infoline = "WARNING: Removing file $filename from file list.\n";
|
|
|
f325b2 |
push( @installer::globals::logfileinfo, $infoline);
|
|
|
f325b2 |
|
|
|
f325b2 |
- push(@missingfiles, "ERROR: File not found: $filename\n");
|
|
|
f325b2 |
- $error_occurred = 1;
|
|
|
f325b2 |
+ push(@missingfiles, "WARNING: File not found: $filename\n");
|
|
|
f325b2 |
|
|
|
f325b2 |
next; # removing this file from list, if sourcepath is empty
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -1167,11 +1165,10 @@ sub remove_Files_Without_Sourcedirectory
|
|
|
f325b2 |
{
|
|
|
f325b2 |
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- $infoline = "ERROR: Removing file $filename from file list.\n";
|
|
|
f325b2 |
+ $infoline = "WARNING: Removing file $filename from file list.\n";
|
|
|
f325b2 |
push( @installer::globals::logfileinfo, $infoline);
|
|
|
f325b2 |
|
|
|
f325b2 |
- push(@missingfiles, "ERROR: File not found: $filename\n");
|
|
|
f325b2 |
- $error_occurred = 1;
|
|
|
f325b2 |
+ push(@missingfiles, "WARNING: File not found: $filename\n");
|
|
|
f325b2 |
|
|
|
f325b2 |
next; # removing this file from list, if sourcepath is empty
|
|
|
f325b2 |
}
|
|
|
f325b2 |
--
|
|
|
f325b2 |
1.8.4.2
|
|
|
f325b2 |
|