summaryrefslogtreecommitdiff
path: root/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
diff options
context:
space:
mode:
Diffstat (limited to 'javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java')
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
index 4383904569c0..c13f32f68339 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
@@ -346,6 +346,7 @@ public class LinuxInstaller extends Installer {
String forceDebianString = "";
String nodepsString = "";
+ String noscriptsString = "";
if ( ! data.debianInvestigated() ) {
helper.investigateDebian(data);
@@ -360,6 +361,10 @@ public class LinuxInstaller extends Installer {
}
}
+ if (( data.isErrorInstallation() ) && ( data.isFirstPackage() )) {
+ noscriptsString = "--noscripts";
+ }
+
// Defining a Vector that contains the full rpm command. Then the string array can be
// created dynamically. Otherwise there would be too many different scenarios.
@@ -375,6 +380,10 @@ public class LinuxInstaller extends Installer {
rpmVector.add(nodepsString);
}
+ if ( ! noscriptsString.equals("") ) {
+ rpmVector.add(noscriptsString);
+ }
+
rpmVector.add("-ev");
if ( useLocalDatabase ) {