From 4059515ab6ebbd9fded06d5015c2bfe3e2a6645e Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Fri, 12 Jan 2007 10:34:31 +0000 Subject: [PATCH] INTEGRATION: CWS vgbugs05 (1.151.6); FILE MERGED 2007/01/12 11:15:29 vg 1.151.6.7: #i69472# 2006/12/08 17:16:12 vg 1.151.6.6: #i72367# addeded error handling for deliver 2006/12/08 13:35:14 vg 1.151.6.5: #144018# removed logging, use COMMON_ENV_TOOLS variable to differentiate SO env from OOo env 2006/12/07 16:44:50 vg 1.151.6.4: #144018# removed logging, use COMMON_ENV_TOOLS variable to differentiate SO env from OOo env 2006/11/24 17:04:22 vg 1.151.6.3: #i71083# forced delete of temporary files 2006/10/27 13:35:18 vg 1.151.6.2: #i66267# added system rm call as fallback for rmtree failure 2006/10/27 12:27:47 vg 1.151.6.1: #i69475#,#i69472#,#i70094# --- solenv/bin/build.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 21e45080f266..9f0a44f3f65f 100644 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -7,9 +7,9 @@ # # $RCSfile: build.pl,v $ # -# $Revision: 1.152 $ +# $Revision: 1.153 $ # -# last change: $Author: vg $ $Date: 2007-01-09 17:18:46 $ +# last change: $Author: vg $ $Date: 2007-01-12 11:34:31 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -76,7 +76,7 @@ ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; - $id_str = ' $Revision: 1.152 $ '; + $id_str = ' $Revision: 1.153 $ '; $id_str =~ /Revision:\s+(\S+)\s+\$/ ? ($script_rev = $1) : ($script_rev = "-"); @@ -2524,7 +2524,8 @@ sub generate_html_file { my ($successes_percent, $errors_percent) = get_progress_percentage(scalar keys %html_info, scalar keys %build_is_finished, scalar keys %modules_with_errors); my $build_duration = get_time_line(time - $build_time); my ($temp_html_file) = scalar tmpnam(); - my $title = $ENV{CWS_WORK_STAMP} . ': ' if (defined $ENV{CWS_WORK_STAMP}); + my $title; + $title = $ENV{CWS_WORK_STAMP} . ': ' if (defined $ENV{CWS_WORK_STAMP}); $title .= $ENV{INPATH}; die("Cannot open $temp_html_file") if (!open(HTML, ">$temp_html_file")); print HTML '';