Changeset 30008 in vbox for trunk

Timestamp:

Jun 3, 2010 11:50:39 AM (15 years ago)

Author:

vboxsync

Message:

Main/OVF: fix 3.2.2 regression that OVFs with a VM description (annotation) could not be imported

Location:

trunk/src/VBox/Main

Files:

• ApplianceImplImport.cpp (modified) (4 diffs)
• include/ApplianceImplPrivate.h (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -1194 +1194 @@
                 stack.strAudioAdapter = vsdeAudioAdapter.front()->strVboxCurrent;
 
+            // for the description of the new machine, always use the OVF entry, the user may have changed it in the import config
+            std::list<VirtualSystemDescriptionEntry*> vsdeDescription = vsdescThis->findByType(VirtualSystemDescriptionType_Description);
+            if (vsdeDescription.size())
+                stack.strDescription = vsdeDescription.front()->strVboxCurrent;
+
             // import vbox:machine or OVF now
             if (vsdescThis->m->pConfig)
@@ -1202 +1207 @@
                 importMachineGeneric(vsysThis, vsdescThis, pNewMachine, stack);
 
-            // for the description of the new machine, always use the OVF entry, the user may have changed it in the import config
-            std::list<VirtualSystemDescriptionEntry*> vsdeDescription = vsdescThis->findByType(VirtualSystemDescriptionType_Description);
-            if (vsdeDescription.size())
-            {
-                const Utf8Str &strDescription = vsdeDescription.front()->strVboxCurrent;
-                rc = pNewMachine->COMSETTER(Description)(Bstr(strDescription));
-                if (FAILED(rc)) throw rc;
-            }
         } // for (it = pAppliance->m->llVirtualSystems.begin() ...
     }
@@ -1454 +1451 @@
 
     // set the description
-    std::list<VirtualSystemDescriptionEntry*> vsdeDescription = vsdescThis->findByType(VirtualSystemDescriptionType_Description);
-    if (vsdeDescription.size())
-    {
-        const Utf8Str &strDescription = vsdeDescription.front()->strVboxCurrent;
-        rc = pNewMachine->COMSETTER(Description)(Bstr(strDescription));
+    if (!stack.strDescription.isEmpty())
+    {
+        rc = pNewMachine->COMSETTER(Description)(Bstr(stack.strDescription));
         if (FAILED(rc)) throw rc;
     }
@@ -2006 +2001 @@
      */
 
-//     std::list<VirtualSystemDescriptionEntry*> llVSDEs;
+    config.strDescription = stack.strDescription;
 
     config.hardwareMachine.cCPUs = stack.cCPUs;

trunk/src/VBox/Main/include/ApplianceImplPrivate.h

@@ -147 +147 @@
     Utf8Str                         strNameVBox;        // VM name
     Utf8Str                         strOsTypeVBox;      // VirtualBox guest OS type as string
+    Utf8Str                         strDescription;
     uint32_t                        cCPUs;              // CPU count
     bool                            fForceHWVirt;       // if true, we force enabling hardware virtualization