Changeset 18223 in vbox

Timestamp:

Mar 24, 2009 7:39:47 PM (16 years ago)

Author:

vboxsync

Message:

OVF: implement EULAs in VBoxManage.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp (modified) (4 diffs)

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

@@ -120 +120 @@
                   || (strThisArg == "-vmname")
                   || (strThisArg == "-memory")
+                  || (strThisArg == "-eula")
                   || (fIsIgnore = (strThisArg == "-ignore"))
                   || (strThisArg.substr(0, 5) == "-type")
@@ -222 +223 @@
                                    ulVsys, cVirtualSystemDescriptions);
         }
+
+        uint32_t cLicensesInTheWay = 0;
 
         // dump virtual system descriptions and match command-line arguments
@@ -290 +293 @@
                                         "\n    (change with \"-vsys %d -ostype <type>\"; use \"list ostypes\" to list all)\n",
                                         a, bstrFinalValue.raw(), i);
+                        break;
+
+                        case VirtualSystemDescriptionType_License:
+                            ++cLicensesInTheWay;
+                            if (findArgValue(strOverride, pmapArgs, "-eula"))
+                            {
+                                if (strOverride == "show")
+                                {
+                                    RTPrintf("%2d: End-user license agreement"
+                                             "\n    (accept with \"-vsys %d -eula accept\"):"
+                                             "\n\n%ls\n\n",
+                                             a, i, bstrFinalValue.raw());
+                                }
+                                else if (strOverride == "accept")
+                                {
+                                    RTPrintf("%2d: End-user license agreement (accepted)\n",
+                                             a);
+                                    --cLicensesInTheWay;
+                                }
+                                else
+                                    return errorSyntax(USAGE_IMPORTAPPLIANCE,
+                                                       "Argument to -eula must be either \"show\" or \"accept\".");
+                            }
+                            else
+                                RTPrintf("%2d: End-user license agreement"
+                                        "\n    (display with \"-vsys %d -eula show\";"
+                                        "\n    accept with \"-vsys %d -eula accept\")\n",
+                                        a, i, i);
                         break;
 
@@ -491 +522 @@
             } // for (unsigned i = 0; i < cVirtualSystemDescriptions; ++i)
 
-            if (fExecute)
+            if (cLicensesInTheWay == 1)
+                RTPrintf("ERROR: Cannot import until the license agreement listed above is accepted.\n");
+            else if (cLicensesInTheWay > 1)
+                RTPrintf("ERROR: Cannot import until the %c license agreements listed above are accepted.\n", cLicensesInTheWay);
+
+            if (!cLicensesInTheWay && fExecute)
             {
                 // go!