Changeset 32064 in vbox for trunk/src

Timestamp:

Aug 29, 2010 9:36:51 AM (14 years ago)

Author:

vboxsync

Message:

Main/OVF: fix UUID messup with multiple disks on OVF export in vbox:Machine

File:

• trunk/src/VBox/Main/ApplianceImplExport.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -660 +660 @@
  *
  * @param elmToAddVirtualSystemsTo XML element to append elements to.
+ * @param pllElementsWithUuidAttributes out: list of XML elements produced here with UUID attributes for quick fixing by caller later
  * @param vsdescThis The IVirtualSystemDescription instance for which to write XML.
  * @param enFormat OVF format (0.9 or 1.0).
@@ -1598 +1599 @@
             // but those would refer to the UUID of the _source_ image (which we created the
             // export image from); those UUIDs need to be fixed to the export image
+            Utf8Str strGuidSourceCurly = guidSource.toStringCurly();
             for (std::list<xml::ElementNode*>::iterator eit = llElementsWithUuidAttributes.begin();
                  eit != llElementsWithUuidAttributes.end();
@@ -1603 +1605 @@
             {
                 xml::ElementNode *pelmImage = *eit;
-                // overwrite existing uuid attribute
-                pelmImage->setAttribute("uuid", guidTarget.toStringCurly());
+                Utf8Str strUUID;
+                pelmImage->getAttributeValue("uuid", strUUID);
+                if (strUUID == strGuidSourceCurly)
+                    // overwrite existing uuid attribute
+                    pelmImage->setAttribute("uuid", guidTarget.toStringCurly());
             }
         }