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