Changeset 107190 in vbox

Timestamp:

Nov 29, 2024 1:36:34 PM (7 weeks ago)

Author:

vboxsync

Message:

src/VBox/Main/src-server/UnattendedInstaller.cpp: Fixed odd conditions (_arm64 variant implies the _x64 one), found by Parfait.

File:

• trunk/src/VBox/Main/src-server/UnattendedInstaller.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/UnattendedInstaller.cpp

@@ -81 +81 @@
     {
         if (   enmDetectedOSType >= VBOXOSTYPE_Debian
-            && (   enmDetectedOSType <= VBOXOSTYPE_Debian_latest_x64
-                || enmDetectedOSType <= VBOXOSTYPE_Debian_latest_arm64))
+            && enmDetectedOSType <= VBOXOSTYPE_Debian_latest_arm64)
             pUinstaller = new UnattendedDebianInstaller(pParent);
         else if (   enmDetectedOSType >= VBOXOSTYPE_Ubuntu
-                 && (   enmDetectedOSType <= VBOXOSTYPE_Ubuntu_latest_x64
-                     || enmDetectedOSType <= VBOXOSTYPE_Ubuntu_latest_arm64))
+                 && enmDetectedOSType <= VBOXOSTYPE_Ubuntu_latest_arm64)
         {
             /*
@@ -123 +121 @@
             pUinstaller = new UnattendedFedoraInstaller(pParent);
         else if (   enmDetectedOSType >= VBOXOSTYPE_Oracle
-                 && (   enmDetectedOSType <= VBOXOSTYPE_Oracle_latest_x64
-                     || enmDetectedOSType <= VBOXOSTYPE_Oracle_latest_arm64))
+                 && enmDetectedOSType <= VBOXOSTYPE_Oracle_latest_arm64)
         {
             if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "9") >= 0)
@@ -138 +135 @@
         }
         else if (   enmDetectedOSType >= VBOXOSTYPE_FreeBSD
-                 && (   enmDetectedOSType <= VBOXOSTYPE_FreeBSD_x64
-                     || enmDetectedOSType <= VBOXOSTYPE_FreeBSD_arm64))
+                 && enmDetectedOSType <= VBOXOSTYPE_FreeBSD_arm64)
             pUinstaller = new UnattendedFreeBsdInstaller(pParent);
 #if 0 /* doesn't work, so convert later. */