Changeset 68151 in vbox for trunk

Timestamp:

Jul 28, 2017 9:13:29 AM (7 years ago)

Author:

vboxsync

Message:

bugref:8527. The parameter --additions-iso doesn't make sense without --install-additions parameter. Added this small check.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -1461 +1461 @@
                 break;
             case 'a':   // --additions-iso
+                if (!ValueUnion.psz)
+                    return errorSyntax("No Additions ISO path specified");
                 vrc = RTPathAbs(ValueUnion.psz, szAbsPath, sizeof(szAbsPath));
                 if (RT_FAILURE(vrc))
@@ -1555 +1557 @@
     if (ptrMachine.isNull())
         return errorSyntax("Missing VM name/UUID");
+
+    {
+        Bstr bstrString;
+        hrc = ptrUnattended->COMGETTER(AdditionsIsoPath)(bstrString.asOutParam());
+        if (SUCCEEDED(hrc))
+        {
+            BOOL fGA = false;
+            hrc = ptrUnattended->COMGETTER(InstallGuestAdditions)(&fGA);
+            if (SUCCEEDED(hrc))
+            {
+                if (fGA == false && !bstrString.isEmpty())
+                    return errorSyntax("Parameter --additions-iso doesn't make sense without "
+                                       "parameter --install-additions");
+            }
+            else
+                return RTEXITCODE_FAILURE;
+        }
+        else
+            return RTEXITCODE_FAILURE;
+    }
 
     /*