summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-05 13:32:16 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-05 13:32:16 +0000
commit1868b110455ee9bec2ea57c461e0d64c702e5852 (patch)
tree5ea51c839b8d026dedf91d30d14745bb11fc8c37
parentf765917980d148572b5eec7da1b15169666fd94e (diff)
CWS-TOOLING: integrate CWS native228
2009-02-27 14:58:20 +0100 is r268595 : #i98665# new nsis version 2009-02-27 14:29:56 +0100 is r268593 : #i98665# new nsis version 2009-02-27 11:39:02 +0100 is r268571 : #i98665# switch to nsis 2.42 2009-02-26 15:30:28 +0100 is r268527 : #i99106# temporary path for simple packaging 2009-02-26 14:38:15 +0100 is r268521 : #i99106# temporary path for simple packaging 2009-02-26 14:36:12 +0100 is r268519 : #i99106# temporary path for simple packaging 2009-02-25 17:59:26 +0100 is r268462 : #i99616# gnome package for Solaris user installation 2009-02-25 17:58:36 +0100 is r268461 : #i99616# gnome package for Solaris user installation 2009-02-25 17:08:08 +0100 is r268455 : #i97206# changing variable replacement in setup script 2009-02-25 17:07:04 +0100 is r268454 : #i97206# changing variable replacement in setup script 2009-02-25 15:48:33 +0100 is r268444 : #i97124# including performance patch
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
index 35c9113c103b..e70fd63b58c8 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
@@ -318,7 +318,7 @@ public class ModuleCtrl {
} else {
boolean goodDepends = true;
if ( installData.getOSType().equalsIgnoreCase("SunOS") ) {
- if (( packageData.getCheckSolaris() != null ) && ( ! packageData.getCheckSolaris().equals("") )) {
+ if (( installData.isRootInstallation() ) && ( packageData.getCheckSolaris() != null ) && ( ! packageData.getCheckSolaris().equals("") )) {
// the package has to be installed. Creating a new package with only packagename
if ( ! installer.isPackageNameInstalled(packageData.getCheckSolaris(), installData) ) {
goodDepends = false;