Changeset 51443 in vbox for trunk/src/VBox

Timestamp:

May 28, 2014 12:03:00 PM (11 years ago)

Author:

vboxsync

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

94004

Message:

Try clean up the -_-uninst directory if it already exists. Suggest vboxmanage cleanup if it continue to fail.

File:

• trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp

@@ -237 +237 @@
 
     rc = RTDirRename(pszExtPackDir, szExtPackUnInstDir, RTPATHRENAME_FLAGS_NO_REPLACE);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to rename the extension pack directory: %Rrc", rc);
+    if (rc == VERR_ALREADY_EXISTS)
+    {
+        /* Automatic cleanup and try again.  It's in theory possible that we're
+           racing another cleanup operation here, so just ignore errors and try
+           again. (There is no installation race due to the exclusive temporary
+           installation directory.) */
+        RemoveExtPackDir(szExtPackUnInstDir, false /*fTemporary*/);
+        rc = RTDirRename(pszExtPackDir, szExtPackUnInstDir, RTPATHRENAME_FLAGS_NO_REPLACE);
+    }
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE,
+                              "Failed to rename the extension pack directory: %Rrc\n"
+                              "If the problem persists, try running the command: VBoxManage extpack cleanup", rc);
 
     /* Recursively delete the directory content. */