Changeset 17718 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 11, 2009 6:57:27 PM (16 years ago)

Author:

vboxsync

Message:

OVF: fix missing VM name on export

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -2445 +2445 @@
 
             std::list<VirtualSystemDescriptionEntry*> llName = vsdescThis->findByType(VirtualSystemDescriptionType_Name);
+            if (llName.size() != 1)
+                throw setError(VBOX_E_NOT_SUPPORTED,
+                               tr("Missing VM name"));
+            pelmVirtualSystem->setAttribute("ovf:id", llName.front()->strVbox);
 
             std::list<VirtualSystemDescriptionEntry*> llOS = vsdescThis->findByType(VirtualSystemDescriptionType_OS);
@@ -2868 +2872 @@
             rc = pVirtualBox->CreateHardDisk(bstrSrcFormat, Bstr(strTargetFilePath), pTargetDisk.asOutParam());
             if (FAILED(rc)) throw rc;
-            /* Clone the source disk image */
+            // clone the source disk image
             rc = pSourceDisk->CloneTo(pTargetDisk, pProgress2.asOutParam());
             if (FAILED(rc)) throw rc;
 
-            /* Advance to the next operation */
+            // advance to the next operation
             if (!task->progress.isNull())
                 task->progress->advanceOperation(BstrFmt(tr("Exporting virtual disk image '%s'"), strSrcFilePath.c_str()));
@@ -2888 +2892 @@
                 if (fCompleted)
                     break;
-                /* Make sure the loop is not too tight */
+                // make sure the loop is not too tight
                 rc = pProgress2->WaitForCompletion(100);
                 if (FAILED(rc)) throw rc;
@@ -2909 +2913 @@
 
             /* Make sure the target disk get detached */
-            rc = pTargetDisk->Close();
+            rc = pTargetDisk->Close();          // @todo  close this also if an error is thrown above
             if (FAILED(rc)) throw rc;
 
@@ -3290 +3294 @@
         bstrName = mUserData->mName;
         // get description
-        bstrName = mUserData->mDescription;
+        bstrDescription = mUserData->mDescription;
         // get guest OS
         bstrGuestOSType = mUserData->mOSTypeId;
@@ -3345 +3349 @@
                            "",
                            strVMName,
-                           Utf8Str(bstrName));
+                           strVMName);
 
         /* CPU count*/