Changeset 49585 in vbox

Timestamp:

Nov 20, 2013 1:55:39 PM (11 years ago)

Author:

vboxsync

Message:

pr7072. noninformative error messages from the function importMachineGeneric() have been fixed.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (10 diffs)

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

@@ -2962 +2962 @@
             stack.fSessionOpen = false;
         }
-        catch(HRESULT /* aRC */)
+        catch(HRESULT aRC)
         {
+            com::ErrorInfo info(this, COM_IIDOF(IAppliance));
+
             if (stack.fSessionOpen)
                 stack.pSession->UnlockMachine();
 
-            throw;
+            if (info.isFullAvailable())
+                throw setError(aRC, Utf8Str(info.getText()).c_str());
+            else
+                throw setError(aRC, "Unknown error during OVF import");
         }
     }
@@ -3083 +3088 @@
                                 }
                                 if (itDiskImage == stack.mapDisks.end())
-                                {
                                     throw setError(E_FAIL,
                                                    tr("Internal inconsistency looking up disk image '%s'. "
                                                       "Check compliance OVA package structure and file names "
-                                                      "references in the section <References> in the OVF file."),
+                                                      "references in the section <References> in the OVF file"),
                                                    availableImage.c_str());
-                                }
 
                                 /* replace with a new found disk image */
@@ -3113 +3116 @@
                                 }
                                 if (!vsdeTargetHD)
-                                {
                                     /*
                                      * in this case it's an error because something wrong with OVF description file.
@@ -3121 +3123 @@
                                                    tr("Internal inconsistency looking up disk image '%s'"),
                                                    diCurrent.strHref.c_str());
-                                }
 
                                 itVDisk = vsysThis.mapVirtualDisks.find(diCurrent.strDiskId);
@@ -3166 +3167 @@
                 ComPtr<IMachine> sMachine;
                 rc = stack.pSession->COMGETTER(Machine)(sMachine.asOutParam());
-                if (FAILED(rc)) throw rc;
+                if (FAILED(rc))
+                    throw rc;
 
                 // find the hard disk controller to which we should attach
@@ -3196 +3198 @@
                                                  dvdImage.asOutParam());
 
-                    if (FAILED(rc)) throw rc;
+                    if (FAILED(rc))
+                        throw rc;
 
                     rc = sMachine->AttachDevice(mhda.controllerType.raw(),// wstring name
@@ -3203 +3206 @@
                                                 DeviceType_DVD,           // DeviceType_T type
                                                 dvdImage);
-                    if (FAILED(rc)) throw rc;
+                    if (FAILED(rc))
+                        throw rc;
                 }
                 else
@@ -3213 +3217 @@
                                                 pTargetHD);
 
-                    if (FAILED(rc)) throw rc;
+                    if (FAILED(rc))
+                        throw rc;
                 }
 
@@ -3219 +3224 @@
 
                 rc = sMachine->SaveSettings();
-                if (FAILED(rc)) throw rc;
+                if (FAILED(rc))
+                    throw rc;
 
                 /* restore */
@@ -3239 +3245 @@
             // only now that we're done with all disks, close the session
             rc = stack.pSession->UnlockMachine();
-            if (FAILED(rc)) throw rc;
+
+            if (FAILED(rc))
+                throw rc;
+
             stack.fSessionOpen = false;
         }
-        catch(HRESULT /* aRC */)
+        catch(HRESULT  aRC)
         {
+            com::ErrorInfo info(this, COM_IIDOF(IAppliance));
+
             if (stack.fSessionOpen)
                 stack.pSession->UnlockMachine();
 
-            throw;
+            if (info.isFullAvailable())
+                throw setError(aRC, Utf8Str(info.getText()).c_str());
+            else
+                throw setError(aRC, "Unknown error during OVF import");
         }
     }