You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
72 lines
3.4 KiB
72 lines
3.4 KiB
From 3d36f9efa2e2f7a39a926e2d1acea2255b990b03 Mon Sep 17 00:00:00 2001
|
|
From: David Tardon <dtardon@redhat.com>
|
|
Date: Mon, 3 Feb 2014 21:41:00 +0100
|
|
Subject: [PATCH] installation fix
|
|
|
|
---
|
|
solenv/bin/modules/installer/scriptitems.pm | 15 ++++++---------
|
|
solenv/bin/modules/installer/worker.pm | 1 -
|
|
2 files changed, 6 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
|
|
index 5f8dfd6..dff0f13 100644
|
|
--- a/solenv/bin/modules/installer/scriptitems.pm
|
|
+++ b/solenv/bin/modules/installer/scriptitems.pm
|
|
@@ -1131,11 +1131,10 @@ sub remove_Files_Without_Sourcedirectory
|
|
|
|
if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
|
|
{
|
|
- $infoline = "ERROR: Removing file $filename from file list.\n";
|
|
+ $infoline = "WARNING: Removing file $filename from file list.\n";
|
|
push( @installer::globals::logfileinfo, $infoline);
|
|
|
|
- push(@missingfiles, "ERROR: File not found: $filename\n");
|
|
- $error_occurred = 1;
|
|
+ push(@missingfiles, "WARNING: File not found: $filename\n");
|
|
|
|
next; # removing this file from list, if sourcepath is empty
|
|
}
|
|
@@ -1143,11 +1142,10 @@ sub remove_Files_Without_Sourcedirectory
|
|
{
|
|
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
|
|
{
|
|
- $infoline = "ERROR: Removing file $filename from file list.\n";
|
|
+ $infoline = "WARNING: Removing file $filename from file list.\n";
|
|
push( @installer::globals::logfileinfo, $infoline);
|
|
|
|
- push(@missingfiles, "ERROR: File not found: $filename\n");
|
|
- $error_occurred = 1;
|
|
+ push(@missingfiles, "WARNING: File not found: $filename\n");
|
|
|
|
next; # removing this file from list, if sourcepath is empty
|
|
}
|
|
@@ -1165,11 +1163,10 @@ sub remove_Files_Without_Sourcedirectory
|
|
{
|
|
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
|
|
{
|
|
- $infoline = "ERROR: Removing file $filename from file list.\n";
|
|
+ $infoline = "WARNING: Removing file $filename from file list.\n";
|
|
push( @installer::globals::logfileinfo, $infoline);
|
|
|
|
- push(@missingfiles, "ERROR: File not found: $filename\n");
|
|
- $error_occurred = 1;
|
|
+ push(@missingfiles, "WARNING: File not found: $filename\n");
|
|
|
|
next; # removing this file from list, if sourcepath is empty
|
|
}
|
|
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
|
|
index aab676f..0e6f67d 100644
|
|
--- a/solenv/bin/modules/installer/worker.pm
|
|
+++ b/solenv/bin/modules/installer/worker.pm
|
|
@@ -96,7 +96,6 @@ sub create_installation_directory
|
|
|
|
$installdir = installer::systemactions::create_directories("install", $languageref);
|
|
installer::logger::print_message( "... creating installation set in $installdir ...\n" );
|
|
- remove_old_installation_sets($installdir);
|
|
my $inprogressinstalldir = $installdir . "_inprogress";
|
|
installer::systemactions::rename_directory($installdir, $inprogressinstalldir);
|
|
$installdir = $inprogressinstalldir;
|
|
--
|
|
2.9.3
|
|
|