From 97386ba33ed64ef5f3d6739d7334f5c40c12442b Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 28 Jul 2009 16:16:54 +0000
Subject: [PATCH] CWS-TOOLING: integrate CWS smoketest23 2009-07-27 14:24:59
 +0200 kz  r274367 : #159577# correct permission after calling admin.pm
 2009-07-22 15:45:19 +0200 kz  r274245 : #159577# create path before calling
 admin.pm 2009-07-10 17:45:31 +0200 kz  r273904 : #159577# fix for cygwin
 2009-07-10 17:41:12 +0200 kz  r273903 : #159577# dif. lineend fixed
 2009-07-01 17:32:09 +0200 kz  r273608 : #159577# an exithandler can be used
 from smoketest 2009-07-01 17:27:50 +0200 kz  r273607 : #159577# now smoketest
 can use admin.pm for installation on windows

---
 solenv/bin/modules/installer/exiter.pm        | 4 ++++
 solenv/bin/modules/installer/globals.pm       | 2 ++
 solenv/bin/modules/installer/windows/admin.pm | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm
index 005e0375e803..15192ca86378 100644
--- a/solenv/bin/modules/installer/exiter.pm
+++ b/solenv/bin/modules/installer/exiter.pm
@@ -107,6 +107,10 @@ sub exit_program
 
     installer::logger::stoptime();
 
+    if (defined($installer::globals::exithandler)) {
+        &$installer::globals::exithandler;
+    }
+
     exit(-1);
 }
 
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 570969cef006..6782e06627b4 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -477,6 +477,8 @@ BEGIN
     @emptypackages = ();
     %fontpackageexists = ();
 
+    $exithandler = undef;
+
     $plat = $^O;
 
     if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )))
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 8cd2b402561c..c6c175fa5027 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -79,10 +79,11 @@ sub unpack_cabinet_file
     my $systemcall = "";
     if ( $^O =~ /cygwin/i ) {
         my $localunpackdir = qx{cygpath -w "$unpackdir"};
+        chomp ($localunpackdir);
         $localunpackdir =~ s/\\/\\\\/g;
         $cabfilename =~ s/\\/\\\\/g;
         $cabfilename =~ s/\s*$//g;
-        $systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $localunpackdir;
+        $systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $localunpackdir . " \> " . $expandlogfile;
     }
     else
     {