Changeset 49447 in vbox

Timestamp:

Nov 12, 2013 11:22:56 AM (11 years ago)

Author:

vboxsync

Message:

pr7072. Changing the old logic for finding an appropriate image format during OVF import

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (1 diff)

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

@@ -2461 +2461 @@
                 {
                     /* We need a proper source format description */
-                    ComObjPtr<MediumFormat> srcFormat;
                     /* Which format to use? */
-                    Utf8Str strSrcFormat = "VDI";
-
-                    std::set<Utf8Str> listURIs = Appliance::URIFromTypeOfVirtualDiskFormat("VMDK");
-                    std::set<Utf8Str>::const_iterator itr = listURIs.find(di.strFormat);
-
-                    if (itr != listURIs.end())
-                    {
-                        strSrcFormat = "VMDK";
-                    }
-
-                    srcFormat = pSysProps->mediumFormat(strSrcFormat);
+                    Utf8Str strSrcFormat = typeOfVirtualDiskFormatFromURI(di.strFormat);
+
+                    ComObjPtr<MediumFormat> srcFormat = pSysProps->mediumFormat(strSrcFormat);
                     if (srcFormat.isNull())
                         throw setError(VBOX_E_NOT_SUPPORTED,
-                                       tr("Could not find a valid medium format for the source disk '%s'"),
+                                       tr("Could not find a valid medium format for the source disk '%s' "
+                                          "Check correctness of the image format URL in the OVF description file."),
                                        RTPathFilename(strSourceOVF.c_str()));