summaryrefslogtreecommitdiff
path: root/solenv/bin/modules/installer/worker.pm
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-26 09:17:08 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-26 09:17:08 +0000
commit082151b8c45f1ca5687d6162e02bb88c73b30754 (patch)
tree5254d123ab150254791af47511d86da2da8ccce5 /solenv/bin/modules/installer/worker.pm
parentaa1600a9e15c2213a203d684a064f11400e58c5e (diff)
CWS-TOOLING: integrate CWS native222
2009-02-05 13:07:21 +0100 hjs r267419 : #i98740# reactivate own versionobj to avoid dependecy on uwinapi caused by unintended symbol reexport 2009-02-03 15:06:32 +0100 is r267332 : #i98740# fixing pathes to dll in Windows registry 2009-02-02 18:07:28 +0100 is r267289 : #i98609# new download creation process 2009-02-02 18:01:35 +0100 is r267288 : #i98609# new download creation process 2009-01-30 17:11:07 +0100 is r267218 : #i98609# new download creation process 2009-01-30 17:10:16 +0100 is r267217 : #i98609# new download creation process 2009-01-30 17:09:37 +0100 is r267216 : #i98609# new download creation process 2009-01-30 17:08:49 +0100 is r267214 : #i98609# new download creation process 2009-01-30 17:08:25 +0100 is r267213 : #i98609# new download creation process 2009-01-30 17:06:17 +0100 is r267212 : #i98609# new download creation process 2009-01-30 17:05:46 +0100 is r267211 : #i98609# new download creation process
Diffstat (limited to 'solenv/bin/modules/installer/worker.pm')
-rw-r--r--solenv/bin/modules/installer/worker.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index e92451eabd17..fa1e36e14e54 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -463,7 +463,11 @@ sub analyze_and_save_logfile
if ( $installdir =~ /_download_inprogress/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_download_inprogress", "_download"); }
elsif ( $installdir =~ /_jds_inprogress/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_jds_inprogress", "_jds"); }
elsif ( $installdir =~ /_msp_inprogress/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_msp_inprogress", "_msp"); }
- else { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "_packed"); }
+ else
+ {
+ if ( $installdir =~ /_packed/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", ""); }
+ else { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "_packed"); }
+ }
installer::mail::send_success_mail($allsettingsarrayref, $languagestringref, $destdir);
}
else