strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS native135 (1.4.6); FILE MERGED

Browse source 
2008/03/04 14:54:18 is 1.4.6.1: #i79534# installation in sparse zones with root privileges
This commit is contained in:
Kurt Zenker 2008-04-02 15:00:35 +00:00
parent 54d4953636
commit 858467baec
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
View file

@ -4,9 +4,9 @@
*
* $RCSfile: PrologueCtrl.java,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: ihi $ $Date: 2008-02-05 13:37:02 $
* last change: $Author: kz $ $Date: 2008-04-02 16:00:35 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -69,7 +69,7 @@ public class PrologueCtrl extends PanelController {
Controller.checkPackagePathExistence(installData);
Controller.checkPackageFormat(installData);
if ( installData.getOSType().equalsIgnoreCase("SunOS") ) {
if (( installData.getOSType().equalsIgnoreCase("SunOS") ) && ( installData.isMultiLingual() )) {
Controller.collectSystemLanguages(installData);
}
@ -103,6 +103,18 @@ public class PrologueCtrl extends PanelController {
}
}
if (( installData.isRootInstallation() ) && ( installData.getOSType().equalsIgnoreCase("SunOS") )) {
// Check, if root has write access in /usr and /etc .
// In sparse zones with imported directories this is not always the case.
if ( Controller.reducedRootWritePrivileges() ) {
ModuleCtrl.setIgnoreNonRelocatablePackages(packageData);
}
if ( installData.logModuleStates() ) {
Dumper.logModuleStates(packageData, "after setIgnoreNonRelocatablePackages");
}
}
if ( installData.isRootInstallation() ) {
Controller.checkForNewerVersion(installData);
}