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

Timestamp:

May 27, 2013 3:26:15 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86035

Message:

Main/ApplianceImplExport.cpp: rearrange handling of appliance description lists, always allow the user to override (especially important for the description of a VM, as it defaults to the VM description which some people might not want to export)
Frontends/VBoxManage: finally implement changing the VM description from command line, and also add a way to provide a VM description on export

File:

• trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

@@ -995 +995 @@
 
     std::list<VirtualSystemDescriptionEntry*> llName = vsdescThis->findByType(VirtualSystemDescriptionType_Name);
-    if (llName.size() != 1)
-        throw setError(VBOX_E_NOT_SUPPORTED,
-                        tr("Missing VM name"));
-    Utf8Str &strVMName = llName.front()->strVboxCurrent;
+    if (!llName.size())
+        throw setError(VBOX_E_NOT_SUPPORTED, tr("Missing VM name"));
+    Utf8Str &strVMName = llName.back()->strVboxCurrent;
     pelmVirtualSystem->setAttribute("ovf:id", strVMName);
 
@@ -1007 +1006 @@
     std::list<VirtualSystemDescriptionEntry*> llVendorUrl = vsdescThis->findByType(VirtualSystemDescriptionType_VendorUrl);
     std::list<VirtualSystemDescriptionEntry*> llVersion = vsdescThis->findByType(VirtualSystemDescriptionType_Version);
-    bool fProduct = llProduct.size() && !llProduct.front()->strVboxCurrent.isEmpty();
-    bool fProductUrl = llProductUrl.size() && !llProductUrl.front()->strVboxCurrent.isEmpty();
-    bool fVendor = llVendor.size() && !llVendor.front()->strVboxCurrent.isEmpty();
-    bool fVendorUrl = llVendorUrl.size() && !llVendorUrl.front()->strVboxCurrent.isEmpty();
-    bool fVersion = llVersion.size() && !llVersion.front()->strVboxCurrent.isEmpty();
+    bool fProduct = llProduct.size() && !llProduct.back()->strVboxCurrent.isEmpty();
+    bool fProductUrl = llProductUrl.size() && !llProductUrl.back()->strVboxCurrent.isEmpty();
+    bool fVendor = llVendor.size() && !llVendor.back()->strVboxCurrent.isEmpty();
+    bool fVendorUrl = llVendorUrl.size() && !llVendorUrl.back()->strVboxCurrent.isEmpty();
+    bool fVersion = llVersion.size() && !llVersion.back()->strVboxCurrent.isEmpty();
     if (fProduct ||
         fProductUrl ||
@@ -1038 +1037 @@
         pelmAnnotationSection->createChild("Info")->addContent("Meta-information about the installed software");
         if (fProduct)
-            pelmAnnotationSection->createChild("Product")->addContent(llProduct.front()->strVboxCurrent);
+            pelmAnnotationSection->createChild("Product")->addContent(llProduct.back()->strVboxCurrent);
         if (fVendor)
-            pelmAnnotationSection->createChild("Vendor")->addContent(llVendor.front()->strVboxCurrent);
+            pelmAnnotationSection->createChild("Vendor")->addContent(llVendor.back()->strVboxCurrent);
         if (fVersion)
-            pelmAnnotationSection->createChild("Version")->addContent(llVersion.front()->strVboxCurrent);
+            pelmAnnotationSection->createChild("Version")->addContent(llVersion.back()->strVboxCurrent);
         if (fProductUrl)
-            pelmAnnotationSection->createChild("ProductUrl")->addContent(llProductUrl.front()->strVboxCurrent);
+            pelmAnnotationSection->createChild("ProductUrl")->addContent(llProductUrl.back()->strVboxCurrent);
         if (fVendorUrl)
-            pelmAnnotationSection->createChild("VendorUrl")->addContent(llVendorUrl.front()->strVboxCurrent);
+            pelmAnnotationSection->createChild("VendorUrl")->addContent(llVendorUrl.back()->strVboxCurrent);
     }
 
@@ -1052 +1051 @@
     std::list<VirtualSystemDescriptionEntry*> llDescription = vsdescThis->findByType(VirtualSystemDescriptionType_Description);
     if (llDescription.size() &&
-        !llDescription.front()->strVboxCurrent.isEmpty())
+        !llDescription.back()->strVboxCurrent.isEmpty())
     {
         /*  <Section ovf:required="false" xsi:type="ovf:AnnotationSection_Type">
@@ -1069 +1068 @@
 
         pelmAnnotationSection->createChild("Info")->addContent("A human-readable annotation");
-        pelmAnnotationSection->createChild("Annotation")->addContent(llDescription.front()->strVboxCurrent);
+        pelmAnnotationSection->createChild("Annotation")->addContent(llDescription.back()->strVboxCurrent);
     }
 
@@ -1075 +1074 @@
     std::list<VirtualSystemDescriptionEntry*> llLicense = vsdescThis->findByType(VirtualSystemDescriptionType_License);
     if (llLicense.size() &&
-        !llLicense.front()->strVboxCurrent.isEmpty())
+        !llLicense.back()->strVboxCurrent.isEmpty())
     {
         /* <EulaSection>
@@ -1091 +1090 @@
 
         pelmEulaSection->createChild("Info")->addContent("License agreement for the virtual system");
-        pelmEulaSection->createChild("License")->addContent(llLicense.front()->strVboxCurrent);
+        pelmEulaSection->createChild("License")->addContent(llLicense.back()->strVboxCurrent);
     }
 
     // operating system
     std::list<VirtualSystemDescriptionEntry*> llOS = vsdescThis->findByType(VirtualSystemDescriptionType_OS);
-    if (llOS.size() != 1)
-        throw setError(VBOX_E_NOT_SUPPORTED,
-                        tr("Missing OS type"));
+    if (!llOS.size())
+        throw setError(VBOX_E_NOT_SUPPORTED, tr("Missing OS type"));
     /*  <OperatingSystemSection ovf:id="82">
             <Info>Guest Operating System</Info>
             <Description>Linux 2.6.x</Description>
         </OperatingSystemSection> */
-    VirtualSystemDescriptionEntry *pvsdeOS = llOS.front();
+    VirtualSystemDescriptionEntry *pvsdeOS = llOS.back();
     xml::ElementNode *pelmOperatingSystemSection;
     if (enFormat == ovf::OVFVersion_0_9)
@@ -1959 +1957 @@
                 if (pDiskEntry->type == VirtualSystemDescriptionType_HardDiskImage)
                 {
-                    rc = pSourceDisk->exportFile(strTargetFilePath.c_str(), 
-                                                 format, 
-                                                 MediumVariant_VmdkStreamOptimized, 
+                    rc = pSourceDisk->exportFile(strTargetFilePath.c_str(),
+                                                 format,
+                                                 MediumVariant_VmdkStreamOptimized,
                                                  pIfIo,
-                                                 pStorage, 
+                                                 pStorage,
                                                  pProgress2);
                     if (FAILED(rc)) throw rc;
@@ -1972 +1970 @@
                     rc = pSourceDisk->exportFile(strTargetFilePath.c_str(),
                                                  formatTemp,
-                                                 MediumVariant_Standard, 
+                                                 MediumVariant_Standard,
                                                  pIfIo,
-                                                 pStorage, 
+                                                 pStorage,
                                                  pProgress2);
                     if (FAILED(rc)) throw rc;