Changeset 17741 in vbox

Timestamp:

Mar 12, 2009 12:39:34 PM (16 years ago)

Author:

vboxsync

Message:

OVF: use the format based on the target file extension & not based on the source format

File:

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

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -2845 +2845 @@
                 /* This isn't allowed */
                 throw setError(VBOX_E_FILE_ERROR,
-                                tr("Source virtual disk image file '%s' doesn't exist"),
-                                    strSrcFilePath.c_str());
+                               tr("Source virtual disk image file '%s' doesn't exist"),
+                               strSrcFilePath.c_str());
 
             // output filename
@@ -2864 +2864 @@
             if (FAILED(rc)) throw rc;
 
-            /* We need the format description of the source disk image */
-            Bstr bstrSrcFormat;
-            rc = pSourceDisk->COMGETTER(Format)(bstrSrcFormat.asOutParam());
-            if (FAILED(rc)) throw rc;
+            /* Based on the file extensions we choose the right format for the
+             * disk */
+            Bstr bstrSrcFormat = L"VDI";
+            if (strTargetFilePath.endsWith(".vmdk"))
+                bstrSrcFormat = L"VMDK";
             /* Create a new hard disk interface for the destination disk image */
             Log(("Creating target disk \"%s\"\n", strTargetFilePath.raw()));
@@ -3479 +3480 @@
                 default:
                     throw setError(VBOX_E_NOT_SUPPORTED,
-                                  tr("Cannot handle hard disk attachment: storageBus is %d, channel is %d, device is %d"), storageBus, lChannel, lDevice);
+                                   tr("Cannot handle hard disk attachment: storageBus is %d, channel is %d, device is %d"), storageBus, lChannel, lDevice);
                 break;
             }