儲存庫 vbox 的更動 82564

時間撮記:

2019-12-12 上午08:44:25 (5 年 以前)

作者:

vboxsync

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

135438

訊息:

Replaced RTDirCreate by RTDirCreateFullPath. Checked WaitForOtherProgressCompletion.

檔案:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (修改) (3 筆差異)

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

@@ -1854 +1854 @@
                                 if (vrc == VERR_FILE_NOT_FOUND || vrc == VERR_PATH_NOT_FOUND)
                                 {
-                                    vrc = RTDirCreate(strMachineFolder.c_str(), 0755, 0);
+                                    vrc = RTDirCreateFullPath(strMachineFolder.c_str(), 0755);
                                     if (RT_FAILURE(vrc))
                                         throw  setErrorVrc(vrc, tr("Could not create the directory '%s' (%Rrc)"),
@@ -1960 +1960 @@
                         /* Now wait for the background import operation to complete;
                          * this throws HRESULTs on error. */
-                        pTask->pProgress->WaitForOtherProgressCompletion(pProgressImport, 0 /* indefinite wait */);
+                        hrc = pTask->pProgress->WaitForOtherProgressCompletion(pProgressImport, 0 /* indefinite wait */);
 
                         /* Try to re-use some OVF stuff here */
+                        if (SUCCEEDED(hrc))
                         {
                             /* Small trick here.
@@ -2001 +2002 @@
                             vsys.mapVirtualDisks[vd.strDiskId] = vd;
 
+                            ++currImageObjectNum;
                         }
-
-                        ++currImageObjectNum;
                     }