Changeset 35523 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 13, 2011 1:12:03 PM (14 years ago)

Author:

vboxsync

Message:

Main,VBoxManage: Implemented the progress objects for ExtPackManager::Uninstall and ExtPackFile::Install. Fixed a bug in ExtPackFile wrt cleaning up on failure.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (2 diffs)

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

@@ -859 +859 @@
         ComPtr<IProgress> ptrProgress;
         CHECK_ERROR2_RET(ptrExtPackFile, Install(fReplace, NULL, ptrProgress.asOutParam()), RTEXITCODE_FAILURE);
-        if (!ptrProgress.isNull())
-            CHECK_ERROR2_RET(ptrProgress, WaitForCompletion(-1), RTEXITCODE_FAILURE);
+        hrc = showProgress(ptrProgress);
+        if (FAILED(hrc))
+        {
+            com::ProgressErrorInfo ErrInfo(ptrProgress);
+            if (ErrInfo.isBasicAvailable())
+                RTMsgError("Failed to install \"%s\": %lS", szPath, ErrInfo.getText().raw());
+            else
+                RTMsgError("Failed to install \"%s\": No error message available!", szPath);
+            return RTEXITCODE_FAILURE;
+        }
         RTPrintf("Successfully installed \"%lS\".\n", bstrName.raw());
     }
@@ -898 +906 @@
         ComPtr<IProgress> ptrProgress;
         CHECK_ERROR2_RET(ptrExtPackMgr, Uninstall(bstrName.raw(), fForced, NULL, ptrProgress.asOutParam()), RTEXITCODE_FAILURE);
-        if (!ptrProgress.isNull())
-            CHECK_ERROR2_RET(ptrProgress, WaitForCompletion(-1), RTEXITCODE_FAILURE);
+        hrc = showProgress(ptrProgress);
+        if (FAILED(hrc))
+        {
+            com::ProgressErrorInfo ErrInfo(ptrProgress);
+            if (ErrInfo.isBasicAvailable())
+                RTMsgError("Failed to uninstall \"%s\": %lS", pszName, ErrInfo.getText().raw());
+            else
+                RTMsgError("Failed to uninstall \"%s\": No error message available!", pszName);
+            return RTEXITCODE_FAILURE;
+        }
         RTPrintf("Successfully uninstalled \"%s\".\n", pszName);
     }