diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 14:23:13 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 14:23:13 +0000 |
| commit | 7726fa90decdedcca8f78386483cc79415b24b11 (patch) | |
| tree | 4dfe44d8d9f66fc1928b31a5d0f40bb5e9ba3473 /javainstaller2 | |
| parent | b6cb37b233628fbd66896728d0dc97b0dc6d3f5c (diff) | |
INTEGRATION: CWS native189_DEV300 (1.6.30); FILE MERGED
2008/08/26 13:47:06 is 1.6.30.1: #i93138# removing solaris packages after dependency check
Diffstat (limited to 'javainstaller2')
| -rwxr-xr-x | javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java index 2ca015d47..a90c2aa23 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SolarisHelper.java,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -146,8 +146,8 @@ public class SolarisHelper { // if ( data.isUserInstallation() ) { idependLine = "idepend=nocheck"; } adminFile.add(idependLine); - String rdependLine = "rdepend=nocheck"; - // String rdependLine = "rdepend=quit"; + // String rdependLine = "rdepend=nocheck"; + String rdependLine = "rdepend=quit"; if ( data.isUserInstallation() ) { rdependLine = "rdepend=nocheck"; } adminFile.add(rdependLine); |