Changeset 17827 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Mar 13, 2009 2:14:08 PM (16 years ago)

Author:

vboxsync

Message:

OVF: move warnings from IVirtualSystem to IAppliance; fix error messages when OVF wants more than one SCSI controller; API docs

File:

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

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

@@ -163 +163 @@
         CHECK_ERROR_BREAK(pAppliance, Read(bstrOvfFilename));
 
-        RTPrintf("Interpreting %s... ", strOvfFilename.c_str());
-        CHECK_ERROR_BREAK(pAppliance, Interpret());
+        // call interpret(); this can yield both warnings and errors, so we need
+        // to tinker with the error info a bit
+        RTPrintf("Interpreting %s...\n", strOvfFilename.c_str());
+        rc = pAppliance->Interpret();
+        com::ErrorInfo info0(pAppliance);
+
+        com::SafeArray<BSTR> aWarnings;
+        if (SUCCEEDED(pAppliance->GetWarnings(ComSafeArrayAsOutParam(aWarnings))))
+        {
+            unsigned cWarnings = aWarnings.size();
+            for (unsigned i = 0; i < cWarnings; ++i)
+            {
+                Bstr bstrWarning(aWarnings[i]);
+                RTPrintf("WARNING: %ls.\n", bstrWarning.raw());
+            }
+        }
+
+        if (FAILED(rc))     // during interpret, after printing warnings
+        {
+            com::GluePrintErrorInfo(info0);
+            com::GluePrintErrorContext("Interpret", __FILE__, __LINE__);
+            break;
+        }
+
         RTPrintf("OK.\n");
 
@@ -470 +492 @@
             if (fExecute)
             {
+                // go!
                 ComPtr<IProgress> progress;
                 CHECK_ERROR_BREAK(pAppliance,