Changeset 34495 in vbox

Timestamp:

Nov 30, 2010 10:12:42 AM (14 years ago)

Author:

vboxsync

Message:

Made extension pack installation work.

Location:

trunk/src/VBox

Files:

• Main/VBoxExtPackHelperApp.cpp (modified) (4 diffs)
• Runtime/common/checksum/manifest3.cpp (modified) (1 diff)

trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp

@@ -612 +612 @@
 
     /*
-     * Set up the destination path and directory.
+     * Set up the destination path.
      */
     char szDstPath[RTPATH_MAX];
@@ -619 +619 @@
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAbs('%s',,) failed: %Rrc", pszDirDst, rc);
     size_t offDstPath = RTPathStripTrailingSlash(szDstPath);
-
-    rc = RTDirCreate(szDstPath, 0700);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTDirCreate('%s',0700) failed: %Rrc", szDstPath, rc);
     szDstPath[offDstPath++] = '/';
     szDstPath[offDstPath]   = '\0';
@@ -674 +670 @@
                         RTVfsIoStrmRelease(hVfsIos);
                     }
-                    else
+                    else if (strcmp(".", pszName) && strcmp("./", pszName))
                         rcExit = UnpackExtPackDir(szDstPath, hVfsObj);
                 }
@@ -987 +983 @@
      * If all checks out correctly, rename it to the final directory.
      */
+    RTDirCreate(pszBaseDir, 0755);
     rc = RTDirCreate(szTmpPath, 0700);
     if (RT_FAILURE(rc))

trunk/src/VBox/Runtime/common/checksum/manifest3.cpp

@@ -471 +471 @@
     PRTMANIFESTPTIOS pThis = (PRTMANIFESTPTIOS)RTVfsIoStreamToPrivate(hVfsPtIos, &g_rtManifestPassthruIosOps);
     AssertReturn(pThis, VERR_INVALID_HANDLE);
-    AssertReturn(pThis->fAddedEntry, VERR_WRONG_ORDER);
+    AssertReturn(!pThis->fAddedEntry, VERR_WRONG_ORDER);
 
     pThis->fAddedEntry = true;