Changeset 49103 in vbox

Timestamp:

Oct 15, 2013 6:20:39 AM (12 years ago)

Author:

vboxsync

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

89937

Message:

pr6927. ISO images are skipped by default during export. The command "VBoxManage export" has a new argument "--iso" to explicitly export ISO images.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageAppliance.cpp (modified) (4 diffs)
• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• Main/include/ApplianceImpl.h (modified) (1 diff)
• Main/include/ApplianceImplPrivate.h (modified) (2 diffs)
• Main/src-server/ApplianceImpl.cpp (modified) (1 diff)
• Main/src-server/ApplianceImplExport.cpp (modified) (1 diff)

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

@@ -796 +796 @@
         { "--ovf20",              '2', RTGETOPT_REQ_NOTHING },
         { "--manifest",           'm', RTGETOPT_REQ_NOTHING },
+        { "--iso",                'I', RTGETOPT_REQ_NOTHING },
         { "--vsys",               's', RTGETOPT_REQ_UINT32 },
         { "--product",            'p', RTGETOPT_REQ_STRING },
@@ -814 +815 @@
     Utf8Str strOvfFormat("ovf-1.0"); // the default export version
     bool fManifest = false; // the default
+    bool fExportISOImages = false; // the default
     std::list< ComPtr<IMachine> > llMachines;
 
@@ -851 +853 @@
                 case '2':   // --ovf20
                      strOvfFormat = "ovf-2.0";
+                     break;
+
+                case 'I':   // --iso
+                     fExportISOImages = true;
                      break;
 
@@ -1055 +1061 @@
             options.push_back(ExportOptions_CreateManifest);
 
+        if (fExportISOImages)
+            options.push_back(ExportOptions_ExportDVDImages);
+
         ComPtr<IProgress> progress;
         CHECK_ERROR_BREAK(pAppliance, Write(Bstr(strOvfFormat).raw(),

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

@@ -410 +410 @@
                      "                            [--legacy09|--ovf09|--ovf10|--ovf20]\n"
                      "                            [--manifest]\n"
+                     "                            [--iso]\n"
                      "                            [--vsys <number of virtual system>]\n"
                      "                                    [--product <product name>]\n"

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

@@ -339 +339 @@
     const settings::MachineConfigFile* getMachineConfig() const;
 
+    void removeByType(VirtualSystemDescriptionType_T aType);
+
     /* private instance data */
 private:

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

@@ -55 +55 @@
       , fManifest(true)
       , fSha256(false)
+      , fExportISOImages(false)
       , pReader(NULL)
       , ulWeightForXmlOperation(0)
@@ -78 +79 @@
     bool                fSha256;        // true = SHA256 (OVF 2.0), false = SHA1 (OVF 1.0)
     Utf8Str             strOVFSHADigest;//SHA digest of OVf file. It is stored here after reading OVF file (before import)
+
+    bool                fExportISOImages;// when 1 the ISO images are exported
 
     RTCList<ImportOptions_T> optListImport;

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

@@ -1559 +1559 @@
 
 /**
+ * Private method; delete all records from the list 
+ * m->llDescriptions that match the given type. 
+ * @param aType
+ * @return
+ */
+void VirtualSystemDescription::removeByType(VirtualSystemDescriptionType_T aType)
+{
+    std::list<VirtualSystemDescriptionEntry*> vsd;
+
+    list<VirtualSystemDescriptionEntry>::iterator it = m->llDescriptions.begin();
+    while (it != m->llDescriptions.end())
+    {
+        if (it->type == aType)
+            it = m->llDescriptions.erase(it);
+        else
+            ++it;
+    }
+}
+
+/**
  * Private method; looks thru the member hardware items for the IDE, SATA, or SCSI controller with
  * the given reference ID. Useful when needing the controller for a particular

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

@@ -597 +597 @@
         m->optListExport = com::SafeArray<ExportOptions_T>(ComSafeArrayInArg(options)).toList();
 
-    AssertReturn(!(m->optListExport.contains(ExportOptions_CreateManifest) && m->optListExport.contains(ExportOptions_ExportDVDImages)), E_INVALIDARG);
+//    AssertReturn(!(m->optListExport.contains(ExportOptions_CreateManifest) && m->optListExport.contains(ExportOptions_ExportDVDImages)), E_INVALIDARG);
+
+    m->fExportISOImages = m->optListExport.contains(ExportOptions_ExportDVDImages);
+
+    if (!m->fExportISOImages)/* remove all ISO images from VirtualSystemDescription */
+    {
+        list< ComObjPtr<VirtualSystemDescription> >::const_iterator it;
+        for (it = m->virtualSystemDescriptions.begin();
+             it != m->virtualSystemDescriptions.end();
+             ++it)
+        {
+            ComObjPtr<VirtualSystemDescription> vsdescThis = (*it);
+            vsdescThis->removeByType(VirtualSystemDescriptionType_CDROM);
+        }
+    }
 
     // do not allow entering this method if the appliance is busy reading or writing