diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-13 12:15:19 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-13 12:15:19 +0000 |
| commit | 142cba488a8084eb15e33feea84b06d522589c0f (patch) | |
| tree | b1d7ec3344a7fb4c24633acd1e5df26a8d37181b | |
| parent | 579c33557349a45f41453f17ea57a043b71a4f82 (diff) | |
INTEGRATION: CWS native55 (1.50.6); FILE MERGED
2006/07/11 08:03:34 is 1.50.6.2: #i67141# epm setting for no and internal
2006/07/10 11:38:15 is 1.50.6.1: #i67141# problem with value of EPM
| -rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index f38015ee5fee..8999a1699eec 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -4,9 +4,9 @@ # # $RCSfile: epmfile.pm,v $ # -# $Revision: 1.51 $ +# $Revision: 1.52 $ # -# last change: $Author: obo $ $Date: 2006-07-10 10:59:57 $ +# last change: $Author: obo $ $Date: 2006-07-13 13:15:19 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -583,6 +583,10 @@ sub find_epm_on_system { $epmname = $ENV{'EPM'}; } + elsif ( ($ENV{'EPM'} eq "no") || ($ENV{'EPM'} eq "internal") ) + { + $epmname = "epm"; + } else { installer::exiter::exit_program("Environment variable EPM set (\"$ENV{'EPM'}\"), but file does not exist or is not executable!", "find_epm_on_system"); |