diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 15:11:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 15:11:56 +0000 |
| commit | 2382af0a0a5b1d8a60b5f34fc0e465431740860c (patch) | |
| tree | 71518089c17519976ca1ced081933816e4afd73d /smoketestoo_native | |
| parent | 02bfc554a105b2aa723b26e7f520edb02f94278f (diff) | |
INTEGRATION: CWS smoketest15_SRC680 (1.20.4.2.2); FILE MERGED
2007/01/25 15:10:03 kz 1.20.4.2.2.2: #i73872# use local install set if using a cygwin shell
2007/01/25 15:08:31 kz 1.20.4.2.2.1: #i73870# chg. log to lock
Diffstat (limited to 'smoketestoo_native')
| -rwxr-xr-x | smoketestoo_native/smoketest.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl index 6fbbee69b910..83b263ff51e7 100755 --- a/smoketestoo_native/smoketest.pl +++ b/smoketestoo_native/smoketest.pl @@ -7,9 +7,9 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # $RCSfile: smoketest.pl,v $ # -# $Revision: 1.22 $ +# $Revision: 1.23 $ # -# last change: $Author: vg $ $Date: 2007-01-15 12:18:34 $ +# last change: $Author: obo $ $Date: 2007-01-25 16:11:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -168,7 +168,7 @@ else { } @error_messages = ( '', - 'log flag for pkgadd still exist. Installation not possible!', + 'lock flag for pkgadd still exist. Installation not possible!', 'Error during installation!', 'Error: patching configuration failed!', 'Error: starting office failed or office crashed!', @@ -256,7 +256,7 @@ if ( $ARGV[0] ) { ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; -$id_str = ' $Revision: 1.22 $ '; +$id_str = ' $Revision: 1.23 $ '; $id_str =~ /Revision:\s+(\S+)\s+\$/ ? ($script_rev = $1) : ($script_rev = "-"); @@ -725,7 +725,7 @@ sub getInstset { ($NEWINSTSET, $INSTSET, $sufix) = fileparse ($smoketest_install); return ($NEWINSTSET, $INSTSET); } - if (!isLocalEnv() and !defined($ENV{CWS_WORK_STAMP}) and (-e $SHIP)) { + if (!isLocalEnv() and !defined($ENV{CWS_WORK_STAMP}) and (-e $SHIP) and ($gui ne $cygwin)) { ($NEWINSTSET, $INSTSET) = getSetFromServer(); } else { |