1. mst
  2. ooo340

Commits

Ingo Schmidt  committed 96e9db2

native330 #i114487# fixing installation on Cent OS

  • Participants
  • Parent commits 2a42ee0
  • Branches default

Comments (0)

Files changed (3)

File javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java

View file
  • Ignore whitespace
     static private boolean useRtl = false;
     static private boolean installedProductMinorSet = false;
     static private boolean isDebianSystem = false;
-    static private boolean useForceDebian = false;
+    static private boolean useForceDebian = false;  /* --force-debian */
     static private boolean debianInvestigated = false;
     static private String installType;            /* custom or typical installation */
     static private String osType;                 /* Linux, SunOS, ...              */

File javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java

View file
  • Ignore whitespace
                 }
                 
                 // Defining a Vector that contains the full rpm command. Then the string array can be 
-                // created dynamically.
+                // created dynamically. Otherwise there would be too many different scenarios.
                 
                 Vector rpmVector = new Vector();
                 
             }
 
             // Defining a Vector that contains the full rpm command. Then the string array can be 
-            // created dynamically.
+            // created dynamically. Otherwise there would be too many different scenarios.
                 
             Vector rpmVector = new Vector();
                 

File javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java

View file
  • Ignore whitespace
         	
             data.setIsDebianSystem(true);
         
-            // Second check: If this is a Debian system, is "--force-debian" required?
+            // Second check: If this is a Debian system, is "--force-debian" required? Older
+            // versions do not support "--force-debian".
         
             // String rpmQuery = "rpm --help;
             String[] rpmQueryArray = new String[2];